diff options
295 files changed, 3444 insertions, 2687 deletions
diff --git a/Documentation/i386/IO-APIC.txt b/Documentation/i386/IO-APIC.txt index f95166645d29..30b4c714fbe1 100644 --- a/Documentation/i386/IO-APIC.txt +++ b/Documentation/i386/IO-APIC.txt | |||
| @@ -70,7 +70,7 @@ Every PCI card emits a PCI IRQ, which can be INTA, INTB, INTC or INTD: | |||
| 70 | 70 | ||
| 71 | These INTA-D PCI IRQs are always 'local to the card', their real meaning | 71 | These INTA-D PCI IRQs are always 'local to the card', their real meaning |
| 72 | depends on which slot they are in. If you look at the daisy chaining diagram, | 72 | depends on which slot they are in. If you look at the daisy chaining diagram, |
| 73 | a card in slot4, issuing INTA IRQ, it will end up as a signal on PIRQ2 of | 73 | a card in slot4, issuing INTA IRQ, it will end up as a signal on PIRQ4 of |
| 74 | the PCI chipset. Most cards issue INTA, this creates optimal distribution | 74 | the PCI chipset. Most cards issue INTA, this creates optimal distribution |
| 75 | between the PIRQ lines. (distributing IRQ sources properly is not a | 75 | between the PIRQ lines. (distributing IRQ sources properly is not a |
| 76 | necessity, PCI IRQs can be shared at will, but it's a good for performance | 76 | necessity, PCI IRQs can be shared at will, but it's a good for performance |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 508e2a2c9864..4cd1a5da80a4 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -170,11 +170,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 170 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA | 170 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA |
| 171 | Format: <irq>,<irq>... | 171 | Format: <irq>,<irq>... |
| 172 | 172 | ||
| 173 | acpi_new_pts_ordering [HW,ACPI] | ||
| 174 | Enforce the ACPI 2.0 ordering of the _PTS control | ||
| 175 | method wrt putting devices into low power states | ||
| 176 | default: pre ACPI 2.0 ordering of _PTS | ||
| 177 | |||
| 178 | acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT | 173 | acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT |
| 179 | 174 | ||
| 180 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS | 175 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS |
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index bec5a32e4095..4c1fc65a8b3d 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /*P:100 This is the Launcher code, a simple program which lays out the | 1 | /*P:100 This is the Launcher code, a simple program which lays out the |
| 2 | * "physical" memory for the new Guest by mapping the kernel image and the | 2 | * "physical" memory for the new Guest by mapping the kernel image and |
| 3 | * virtual devices, then reads repeatedly from /dev/lguest to run the Guest. | 3 | * the virtual devices, then opens /dev/lguest to tell the kernel |
| 4 | :*/ | 4 | * about the Guest and control it. :*/ |
| 5 | #define _LARGEFILE64_SOURCE | 5 | #define _LARGEFILE64_SOURCE |
| 6 | #define _GNU_SOURCE | 6 | #define _GNU_SOURCE |
| 7 | #include <stdio.h> | 7 | #include <stdio.h> |
| @@ -43,7 +43,7 @@ | |||
| 43 | #include "linux/virtio_console.h" | 43 | #include "linux/virtio_console.h" |
| 44 | #include "linux/virtio_ring.h" | 44 | #include "linux/virtio_ring.h" |
| 45 | #include "asm-x86/bootparam.h" | 45 | #include "asm-x86/bootparam.h" |
| 46 | /*L:110 We can ignore the 38 include files we need for this program, but I do | 46 | /*L:110 We can ignore the 39 include files we need for this program, but I do |
| 47 | * want to draw attention to the use of kernel-style types. | 47 | * want to draw attention to the use of kernel-style types. |
| 48 | * | 48 | * |
| 49 | * As Linus said, "C is a Spartan language, and so should your naming be." I | 49 | * As Linus said, "C is a Spartan language, and so should your naming be." I |
| @@ -320,7 +320,7 @@ static unsigned long map_elf(int elf_fd, const Elf32_Ehdr *ehdr) | |||
| 320 | err(1, "Reading program headers"); | 320 | err(1, "Reading program headers"); |
| 321 | 321 | ||
| 322 | /* Try all the headers: there are usually only three. A read-only one, | 322 | /* Try all the headers: there are usually only three. A read-only one, |
| 323 | * a read-write one, and a "note" section which isn't loadable. */ | 323 | * a read-write one, and a "note" section which we don't load. */ |
| 324 | for (i = 0; i < ehdr->e_phnum; i++) { | 324 | for (i = 0; i < ehdr->e_phnum; i++) { |
| 325 | /* If this isn't a loadable segment, we ignore it */ | 325 | /* If this isn't a loadable segment, we ignore it */ |
| 326 | if (phdr[i].p_type != PT_LOAD) | 326 | if (phdr[i].p_type != PT_LOAD) |
| @@ -387,7 +387,7 @@ static unsigned long load_kernel(int fd) | |||
| 387 | if (memcmp(hdr.e_ident, ELFMAG, SELFMAG) == 0) | 387 | if (memcmp(hdr.e_ident, ELFMAG, SELFMAG) == 0) |
| 388 | return map_elf(fd, &hdr); | 388 | return map_elf(fd, &hdr); |
| 389 | 389 | ||
| 390 | /* Otherwise we assume it's a bzImage, and try to unpack it */ | 390 | /* Otherwise we assume it's a bzImage, and try to load it. */ |
| 391 | return load_bzimage(fd); | 391 | return load_bzimage(fd); |
| 392 | } | 392 | } |
| 393 | 393 | ||
| @@ -433,12 +433,12 @@ static unsigned long load_initrd(const char *name, unsigned long mem) | |||
| 433 | return len; | 433 | return len; |
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | /* Once we know how much memory we have, we can construct simple linear page | 436 | /* Once we know how much memory we have we can construct simple linear page |
| 437 | * tables which set virtual == physical which will get the Guest far enough | 437 | * tables which set virtual == physical which will get the Guest far enough |
| 438 | * into the boot to create its own. | 438 | * into the boot to create its own. |
| 439 | * | 439 | * |
| 440 | * We lay them out of the way, just below the initrd (which is why we need to | 440 | * We lay them out of the way, just below the initrd (which is why we need to |
| 441 | * know its size). */ | 441 | * know its size here). */ |
| 442 | static unsigned long setup_pagetables(unsigned long mem, | 442 | static unsigned long setup_pagetables(unsigned long mem, |
| 443 | unsigned long initrd_size) | 443 | unsigned long initrd_size) |
| 444 | { | 444 | { |
| @@ -850,7 +850,8 @@ static void handle_console_output(int fd, struct virtqueue *vq) | |||
| 850 | * | 850 | * |
| 851 | * Handling output for network is also simple: we get all the output buffers | 851 | * Handling output for network is also simple: we get all the output buffers |
| 852 | * and write them (ignoring the first element) to this device's file descriptor | 852 | * and write them (ignoring the first element) to this device's file descriptor |
| 853 | * (stdout). */ | 853 | * (/dev/net/tun). |
| 854 | */ | ||
| 854 | static void handle_net_output(int fd, struct virtqueue *vq) | 855 | static void handle_net_output(int fd, struct virtqueue *vq) |
| 855 | { | 856 | { |
| 856 | unsigned int head, out, in; | 857 | unsigned int head, out, in; |
| @@ -924,7 +925,7 @@ static void enable_fd(int fd, struct virtqueue *vq) | |||
| 924 | write(waker_fd, &vq->dev->fd, sizeof(vq->dev->fd)); | 925 | write(waker_fd, &vq->dev->fd, sizeof(vq->dev->fd)); |
| 925 | } | 926 | } |
| 926 | 927 | ||
| 927 | /* Resetting a device is fairly easy. */ | 928 | /* When the Guest asks us to reset a device, it's is fairly easy. */ |
| 928 | static void reset_device(struct device *dev) | 929 | static void reset_device(struct device *dev) |
| 929 | { | 930 | { |
| 930 | struct virtqueue *vq; | 931 | struct virtqueue *vq; |
| @@ -1003,8 +1004,8 @@ static void handle_input(int fd) | |||
| 1003 | if (select(devices.max_infd+1, &fds, NULL, NULL, &poll) == 0) | 1004 | if (select(devices.max_infd+1, &fds, NULL, NULL, &poll) == 0) |
| 1004 | break; | 1005 | break; |
| 1005 | 1006 | ||
| 1006 | /* Otherwise, call the device(s) which have readable | 1007 | /* Otherwise, call the device(s) which have readable file |
| 1007 | * file descriptors and a method of handling them. */ | 1008 | * descriptors and a method of handling them. */ |
| 1008 | for (i = devices.dev; i; i = i->next) { | 1009 | for (i = devices.dev; i; i = i->next) { |
| 1009 | if (i->handle_input && FD_ISSET(i->fd, &fds)) { | 1010 | if (i->handle_input && FD_ISSET(i->fd, &fds)) { |
| 1010 | int dev_fd; | 1011 | int dev_fd; |
| @@ -1015,8 +1016,7 @@ static void handle_input(int fd) | |||
| 1015 | * should no longer service it. Networking and | 1016 | * should no longer service it. Networking and |
| 1016 | * console do this when there's no input | 1017 | * console do this when there's no input |
| 1017 | * buffers to deliver into. Console also uses | 1018 | * buffers to deliver into. Console also uses |
| 1018 | * it when it discovers that stdin is | 1019 | * it when it discovers that stdin is closed. */ |
| 1019 | * closed. */ | ||
| 1020 | FD_CLR(i->fd, &devices.infds); | 1020 | FD_CLR(i->fd, &devices.infds); |
| 1021 | /* Tell waker to ignore it too, by sending a | 1021 | /* Tell waker to ignore it too, by sending a |
| 1022 | * negative fd number (-1, since 0 is a valid | 1022 | * negative fd number (-1, since 0 is a valid |
| @@ -1033,7 +1033,8 @@ static void handle_input(int fd) | |||
| 1033 | * | 1033 | * |
| 1034 | * All devices need a descriptor so the Guest knows it exists, and a "struct | 1034 | * All devices need a descriptor so the Guest knows it exists, and a "struct |
| 1035 | * device" so the Launcher can keep track of it. We have common helper | 1035 | * device" so the Launcher can keep track of it. We have common helper |
| 1036 | * routines to allocate and manage them. */ | 1036 | * routines to allocate and manage them. |
| 1037 | */ | ||
| 1037 | 1038 | ||
| 1038 | /* The layout of the device page is a "struct lguest_device_desc" followed by a | 1039 | /* The layout of the device page is a "struct lguest_device_desc" followed by a |
| 1039 | * number of virtqueue descriptors, then two sets of feature bits, then an | 1040 | * number of virtqueue descriptors, then two sets of feature bits, then an |
| @@ -1078,7 +1079,7 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs, | |||
| 1078 | struct virtqueue **i, *vq = malloc(sizeof(*vq)); | 1079 | struct virtqueue **i, *vq = malloc(sizeof(*vq)); |
| 1079 | void *p; | 1080 | void *p; |
| 1080 | 1081 | ||
| 1081 | /* First we need some pages for this virtqueue. */ | 1082 | /* First we need some memory for this virtqueue. */ |
| 1082 | pages = (vring_size(num_descs, getpagesize()) + getpagesize() - 1) | 1083 | pages = (vring_size(num_descs, getpagesize()) + getpagesize() - 1) |
| 1083 | / getpagesize(); | 1084 | / getpagesize(); |
| 1084 | p = get_pages(pages); | 1085 | p = get_pages(pages); |
| @@ -1122,7 +1123,7 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs, | |||
| 1122 | } | 1123 | } |
| 1123 | 1124 | ||
| 1124 | /* The first half of the feature bitmask is for us to advertise features. The | 1125 | /* The first half of the feature bitmask is for us to advertise features. The |
| 1125 | * second half if for the Guest to accept features. */ | 1126 | * second half is for the Guest to accept features. */ |
| 1126 | static void add_feature(struct device *dev, unsigned bit) | 1127 | static void add_feature(struct device *dev, unsigned bit) |
| 1127 | { | 1128 | { |
| 1128 | u8 *features = get_feature_bits(dev); | 1129 | u8 *features = get_feature_bits(dev); |
| @@ -1151,7 +1152,9 @@ static void set_config(struct device *dev, unsigned len, const void *conf) | |||
| 1151 | } | 1152 | } |
| 1152 | 1153 | ||
| 1153 | /* This routine does all the creation and setup of a new device, including | 1154 | /* This routine does all the creation and setup of a new device, including |
| 1154 | * calling new_dev_desc() to allocate the descriptor and device memory. */ | 1155 | * calling new_dev_desc() to allocate the descriptor and device memory. |
| 1156 | * | ||
| 1157 | * See what I mean about userspace being boring? */ | ||
| 1155 | static struct device *new_device(const char *name, u16 type, int fd, | 1158 | static struct device *new_device(const char *name, u16 type, int fd, |
| 1156 | bool (*handle_input)(int, struct device *)) | 1159 | bool (*handle_input)(int, struct device *)) |
| 1157 | { | 1160 | { |
| @@ -1383,7 +1386,6 @@ struct vblk_info | |||
| 1383 | * Launcher triggers interrupt to Guest. */ | 1386 | * Launcher triggers interrupt to Guest. */ |
| 1384 | int done_fd; | 1387 | int done_fd; |
| 1385 | }; | 1388 | }; |
| 1386 | /*:*/ | ||
| 1387 | 1389 | ||
| 1388 | /*L:210 | 1390 | /*L:210 |
| 1389 | * The Disk | 1391 | * The Disk |
| @@ -1493,7 +1495,10 @@ static int io_thread(void *_dev) | |||
| 1493 | while (read(vblk->workpipe[0], &c, 1) == 1) { | 1495 | while (read(vblk->workpipe[0], &c, 1) == 1) { |
| 1494 | /* We acknowledge each request immediately to reduce latency, | 1496 | /* We acknowledge each request immediately to reduce latency, |
| 1495 | * rather than waiting until we've done them all. I haven't | 1497 | * rather than waiting until we've done them all. I haven't |
| 1496 | * measured to see if it makes any difference. */ | 1498 | * measured to see if it makes any difference. |
| 1499 | * | ||
| 1500 | * That would be an interesting test, wouldn't it? You could | ||
| 1501 | * also try having more than one I/O thread. */ | ||
| 1497 | while (service_io(dev)) | 1502 | while (service_io(dev)) |
| 1498 | write(vblk->done_fd, &c, 1); | 1503 | write(vblk->done_fd, &c, 1); |
| 1499 | } | 1504 | } |
| @@ -1501,7 +1506,7 @@ static int io_thread(void *_dev) | |||
| 1501 | } | 1506 | } |
| 1502 | 1507 | ||
| 1503 | /* Now we've seen the I/O thread, we return to the Launcher to see what happens | 1508 | /* Now we've seen the I/O thread, we return to the Launcher to see what happens |
| 1504 | * when the thread tells us it's completed some I/O. */ | 1509 | * when that thread tells us it's completed some I/O. */ |
| 1505 | static bool handle_io_finish(int fd, struct device *dev) | 1510 | static bool handle_io_finish(int fd, struct device *dev) |
| 1506 | { | 1511 | { |
| 1507 | char c; | 1512 | char c; |
| @@ -1573,11 +1578,12 @@ static void setup_block_file(const char *filename) | |||
| 1573 | * more work. */ | 1578 | * more work. */ |
| 1574 | pipe(vblk->workpipe); | 1579 | pipe(vblk->workpipe); |
| 1575 | 1580 | ||
| 1576 | /* Create stack for thread and run it */ | 1581 | /* Create stack for thread and run it. Since stack grows upwards, we |
| 1582 | * point the stack pointer to the end of this region. */ | ||
| 1577 | stack = malloc(32768); | 1583 | stack = malloc(32768); |
| 1578 | /* SIGCHLD - We dont "wait" for our cloned thread, so prevent it from | 1584 | /* SIGCHLD - We dont "wait" for our cloned thread, so prevent it from |
| 1579 | * becoming a zombie. */ | 1585 | * becoming a zombie. */ |
| 1580 | if (clone(io_thread, stack + 32768, CLONE_VM | SIGCHLD, dev) == -1) | 1586 | if (clone(io_thread, stack + 32768, CLONE_VM | SIGCHLD, dev) == -1) |
| 1581 | err(1, "Creating clone"); | 1587 | err(1, "Creating clone"); |
| 1582 | 1588 | ||
| 1583 | /* We don't need to keep the I/O thread's end of the pipes open. */ | 1589 | /* We don't need to keep the I/O thread's end of the pipes open. */ |
| @@ -1587,14 +1593,14 @@ static void setup_block_file(const char *filename) | |||
| 1587 | verbose("device %u: virtblock %llu sectors\n", | 1593 | verbose("device %u: virtblock %llu sectors\n", |
| 1588 | devices.device_num, le64_to_cpu(conf.capacity)); | 1594 | devices.device_num, le64_to_cpu(conf.capacity)); |
| 1589 | } | 1595 | } |
| 1590 | /* That's the end of device setup. :*/ | 1596 | /* That's the end of device setup. */ |
| 1591 | 1597 | ||
| 1592 | /* Reboot */ | 1598 | /*L:230 Reboot is pretty easy: clean up and exec() the Launcher afresh. */ |
| 1593 | static void __attribute__((noreturn)) restart_guest(void) | 1599 | static void __attribute__((noreturn)) restart_guest(void) |
| 1594 | { | 1600 | { |
| 1595 | unsigned int i; | 1601 | unsigned int i; |
| 1596 | 1602 | ||
| 1597 | /* Closing pipes causes the waker thread and io_threads to die, and | 1603 | /* Closing pipes causes the Waker thread and io_threads to die, and |
| 1598 | * closing /dev/lguest cleans up the Guest. Since we don't track all | 1604 | * closing /dev/lguest cleans up the Guest. Since we don't track all |
| 1599 | * open fds, we simply close everything beyond stderr. */ | 1605 | * open fds, we simply close everything beyond stderr. */ |
| 1600 | for (i = 3; i < FD_SETSIZE; i++) | 1606 | for (i = 3; i < FD_SETSIZE; i++) |
| @@ -1603,7 +1609,7 @@ static void __attribute__((noreturn)) restart_guest(void) | |||
| 1603 | err(1, "Could not exec %s", main_args[0]); | 1609 | err(1, "Could not exec %s", main_args[0]); |
| 1604 | } | 1610 | } |
| 1605 | 1611 | ||
| 1606 | /*L:220 Finally we reach the core of the Launcher, which runs the Guest, serves | 1612 | /*L:220 Finally we reach the core of the Launcher which runs the Guest, serves |
| 1607 | * its input and output, and finally, lays it to rest. */ | 1613 | * its input and output, and finally, lays it to rest. */ |
| 1608 | static void __attribute__((noreturn)) run_guest(int lguest_fd) | 1614 | static void __attribute__((noreturn)) run_guest(int lguest_fd) |
| 1609 | { | 1615 | { |
| @@ -1644,7 +1650,7 @@ static void __attribute__((noreturn)) run_guest(int lguest_fd) | |||
| 1644 | err(1, "Resetting break"); | 1650 | err(1, "Resetting break"); |
| 1645 | } | 1651 | } |
| 1646 | } | 1652 | } |
| 1647 | /* | 1653 | /*L:240 |
| 1648 | * This is the end of the Launcher. The good news: we are over halfway | 1654 | * This is the end of the Launcher. The good news: we are over halfway |
| 1649 | * through! The bad news: the most fiendish part of the code still lies ahead | 1655 | * through! The bad news: the most fiendish part of the code still lies ahead |
| 1650 | * of us. | 1656 | * of us. |
| @@ -1691,8 +1697,8 @@ int main(int argc, char *argv[]) | |||
| 1691 | * device receive input from a file descriptor, we keep an fdset | 1697 | * device receive input from a file descriptor, we keep an fdset |
| 1692 | * (infds) and the maximum fd number (max_infd) with the head of the | 1698 | * (infds) and the maximum fd number (max_infd) with the head of the |
| 1693 | * list. We also keep a pointer to the last device. Finally, we keep | 1699 | * list. We also keep a pointer to the last device. Finally, we keep |
| 1694 | * the next interrupt number to hand out (1: remember that 0 is used by | 1700 | * the next interrupt number to use for devices (1: remember that 0 is |
| 1695 | * the timer). */ | 1701 | * used by the timer). */ |
| 1696 | FD_ZERO(&devices.infds); | 1702 | FD_ZERO(&devices.infds); |
| 1697 | devices.max_infd = -1; | 1703 | devices.max_infd = -1; |
| 1698 | devices.lastdev = NULL; | 1704 | devices.lastdev = NULL; |
| @@ -1793,8 +1799,8 @@ int main(int argc, char *argv[]) | |||
| 1793 | lguest_fd = tell_kernel(pgdir, start); | 1799 | lguest_fd = tell_kernel(pgdir, start); |
| 1794 | 1800 | ||
| 1795 | /* We fork off a child process, which wakes the Launcher whenever one | 1801 | /* We fork off a child process, which wakes the Launcher whenever one |
| 1796 | * of the input file descriptors needs attention. Otherwise we would | 1802 | * of the input file descriptors needs attention. We call this the |
| 1797 | * run the Guest until it tries to output something. */ | 1803 | * Waker, and we'll cover it in a moment. */ |
| 1798 | waker_fd = setup_waker(lguest_fd); | 1804 | waker_fd = setup_waker(lguest_fd); |
| 1799 | 1805 | ||
| 1800 | /* Finally, run the Guest. This doesn't return. */ | 1806 | /* Finally, run the Guest. This doesn't return. */ |
diff --git a/Documentation/lguest/lguest.txt b/Documentation/lguest/lguest.txt index 722d4e7fbebe..29510dc51510 100644 --- a/Documentation/lguest/lguest.txt +++ b/Documentation/lguest/lguest.txt | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | Rusty's Remarkably Unreliable Guide to Lguest | 1 | __ |
| 2 | - or, A Young Coder's Illustrated Hypervisor | 2 | (___()'`; Rusty's Remarkably Unreliable Guide to Lguest |
| 3 | http://lguest.ozlabs.org | 3 | /, /` - or, A Young Coder's Illustrated Hypervisor |
| 4 | \\"--\\ http://lguest.ozlabs.org | ||
| 4 | 5 | ||
| 5 | Lguest is designed to be a minimal hypervisor for the Linux kernel, for | 6 | Lguest is designed to be a minimal hypervisor for the Linux kernel, for |
| 6 | Linux developers and users to experiment with virtualization with the | 7 | Linux developers and users to experiment with virtualization with the |
| @@ -41,12 +42,16 @@ Running Lguest: | |||
| 41 | CONFIG_PHYSICAL_ALIGN=0x100000) | 42 | CONFIG_PHYSICAL_ALIGN=0x100000) |
| 42 | 43 | ||
| 43 | "Device Drivers": | 44 | "Device Drivers": |
| 45 | "Block devices" | ||
| 46 | "Virtio block driver (EXPERIMENTAL)" = M/Y | ||
| 44 | "Network device support" | 47 | "Network device support" |
| 45 | "Universal TUN/TAP device driver support" = M/Y | 48 | "Universal TUN/TAP device driver support" = M/Y |
| 46 | (CONFIG_TUN=m) | 49 | "Virtio network driver (EXPERIMENTAL)" = M/Y |
| 47 | "Virtualization" | 50 | (CONFIG_VIRTIO_BLK=m, CONFIG_VIRTIO_NET=m and CONFIG_TUN=m) |
| 48 | "Linux hypervisor example code" = M/Y | 51 | |
| 49 | (CONFIG_LGUEST=m) | 52 | "Virtualization" |
| 53 | "Linux hypervisor example code" = M/Y | ||
| 54 | (CONFIG_LGUEST=m) | ||
| 50 | 55 | ||
| 51 | - A tool called "lguest" is available in this directory: type "make" | 56 | - A tool called "lguest" is available in this directory: type "make" |
| 52 | to build it. If you didn't build your kernel in-tree, use "make | 57 | to build it. If you didn't build your kernel in-tree, use "make |
diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt index c025a4561c10..757c729ee42e 100644 --- a/Documentation/nmi_watchdog.txt +++ b/Documentation/nmi_watchdog.txt | |||
| @@ -23,8 +23,7 @@ kernel debugging options, such as Kernel Stack Meter or Kernel Tracer, | |||
| 23 | may implicitly disable the NMI watchdog.] | 23 | may implicitly disable the NMI watchdog.] |
| 24 | 24 | ||
| 25 | For x86-64, the needed APIC is always compiled in, and the NMI watchdog is | 25 | For x86-64, the needed APIC is always compiled in, and the NMI watchdog is |
| 26 | always enabled with I/O-APIC mode (nmi_watchdog=1). Currently, local APIC | 26 | always enabled with I/O-APIC mode (nmi_watchdog=1). |
| 27 | mode (nmi_watchdog=2) does not work on x86-64. | ||
| 28 | 27 | ||
| 29 | Using local APIC (nmi_watchdog=2) needs the first performance register, so | 28 | Using local APIC (nmi_watchdog=2) needs the first performance register, so |
| 30 | you can't use it for other purposes (such as high precision performance | 29 | you can't use it for other purposes (such as high precision performance |
diff --git a/MAINTAINERS b/MAINTAINERS index 73883b8bbd76..90dcbbcad91c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -163,6 +163,12 @@ M: A2232@gmx.net | |||
| 163 | L: linux-m68k@lists.linux-m68k.org | 163 | L: linux-m68k@lists.linux-m68k.org |
| 164 | S: Maintained | 164 | S: Maintained |
| 165 | 165 | ||
| 166 | AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN | ||
| 167 | P: David Howells | ||
| 168 | M: dhowells@redhat.com | ||
| 169 | L: linux-afs@lists.infradead.org | ||
| 170 | S: Supported | ||
| 171 | |||
| 166 | AIO | 172 | AIO |
| 167 | P: Benjamin LaHaise | 173 | P: Benjamin LaHaise |
| 168 | M: bcrl@kvack.org | 174 | M: bcrl@kvack.org |
| @@ -2110,7 +2116,7 @@ M: reinette.chatre@intel.com | |||
| 2110 | L: linux-wireless@vger.kernel.org | 2116 | L: linux-wireless@vger.kernel.org |
| 2111 | L: ipw3945-devel@lists.sourceforge.net | 2117 | L: ipw3945-devel@lists.sourceforge.net |
| 2112 | W: http://intellinuxwireless.org | 2118 | W: http://intellinuxwireless.org |
| 2113 | T: git git://intellinuxwireless.org/repos/iwlwifi | 2119 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git |
| 2114 | S: Supported | 2120 | S: Supported |
| 2115 | 2121 | ||
| 2116 | IOC3 ETHERNET DRIVER | 2122 | IOC3 ETHERNET DRIVER |
| @@ -2314,14 +2320,14 @@ L: kexec@lists.infradead.org | |||
| 2314 | S: Maintained | 2320 | S: Maintained |
| 2315 | 2321 | ||
| 2316 | KPROBES | 2322 | KPROBES |
| 2317 | P: Prasanna S Panchamukhi | ||
| 2318 | M: prasanna@in.ibm.com | ||
| 2319 | P: Ananth N Mavinakayanahalli | 2323 | P: Ananth N Mavinakayanahalli |
| 2320 | M: ananth@in.ibm.com | 2324 | M: ananth@in.ibm.com |
| 2321 | P: Anil S Keshavamurthy | 2325 | P: Anil S Keshavamurthy |
| 2322 | M: anil.s.keshavamurthy@intel.com | 2326 | M: anil.s.keshavamurthy@intel.com |
| 2323 | P: David S. Miller | 2327 | P: David S. Miller |
| 2324 | M: davem@davemloft.net | 2328 | M: davem@davemloft.net |
| 2329 | P: Masami Hiramatsu | ||
| 2330 | M: mhiramat@redhat.com | ||
| 2325 | L: linux-kernel@vger.kernel.org | 2331 | L: linux-kernel@vger.kernel.org |
| 2326 | S: Maintained | 2332 | S: Maintained |
| 2327 | 2333 | ||
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index 538262241483..5fe9588db077 100644 --- a/arch/arm/common/it8152.c +++ b/arch/arm/common/it8152.c | |||
| @@ -120,6 +120,7 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc) | |||
| 120 | time, when they all three were 0. */ | 120 | time, when they all three were 0. */ |
| 121 | bits_pd = __raw_readl(IT8152_INTC_PDCNIRR); | 121 | bits_pd = __raw_readl(IT8152_INTC_PDCNIRR); |
| 122 | bits_lp = __raw_readl(IT8152_INTC_LPCNIRR); | 122 | bits_lp = __raw_readl(IT8152_INTC_LPCNIRR); |
| 123 | bits_ld = __raw_readl(IT8152_INTC_LDCNIRR); | ||
| 123 | if (!(bits_ld | bits_lp | bits_pd)) | 124 | if (!(bits_ld | bits_lp | bits_pd)) |
| 124 | return; | 125 | return; |
| 125 | } | 126 | } |
| @@ -133,14 +134,14 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc) | |||
| 133 | 134 | ||
| 134 | bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1); | 135 | bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1); |
| 135 | while (bits_lp) { | 136 | while (bits_lp) { |
| 136 | i = __ffs(bits_pd); | 137 | i = __ffs(bits_lp); |
| 137 | it8152_irq(IT8152_LP_IRQ(i)); | 138 | it8152_irq(IT8152_LP_IRQ(i)); |
| 138 | bits_lp &= ~(1 << i); | 139 | bits_lp &= ~(1 << i); |
| 139 | } | 140 | } |
| 140 | 141 | ||
| 141 | bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1); | 142 | bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1); |
| 142 | while (bits_ld) { | 143 | while (bits_ld) { |
| 143 | i = __ffs(bits_pd); | 144 | i = __ffs(bits_ld); |
| 144 | it8152_irq(IT8152_LD_IRQ(i)); | 145 | it8152_irq(IT8152_LD_IRQ(i)); |
| 145 | bits_ld &= ~(1 << i); | 146 | bits_ld &= ~(1 << i); |
| 146 | } | 147 | } |
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 283e14fff993..7e97b7376563 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
| @@ -336,7 +336,7 @@ | |||
| 336 | CALL(sys_mknodat) | 336 | CALL(sys_mknodat) |
| 337 | /* 325 */ CALL(sys_fchownat) | 337 | /* 325 */ CALL(sys_fchownat) |
| 338 | CALL(sys_futimesat) | 338 | CALL(sys_futimesat) |
| 339 | CALL(sys_fstatat64) | 339 | CALL(ABI(sys_fstatat64, sys_oabi_fstatat64)) |
| 340 | CALL(sys_unlinkat) | 340 | CALL(sys_unlinkat) |
| 341 | CALL(sys_renameat) | 341 | CALL(sys_renameat) |
| 342 | /* 330 */ CALL(sys_linkat) | 342 | /* 330 */ CALL(sys_linkat) |
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c index e8b98046895b..96ab5f52949c 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | * sys_stat64: | 25 | * sys_stat64: |
| 26 | * sys_lstat64: | 26 | * sys_lstat64: |
| 27 | * sys_fstat64: | 27 | * sys_fstat64: |
| 28 | * sys_fstatat64: | ||
| 28 | * | 29 | * |
| 29 | * struct stat64 has different sizes and some members are shifted | 30 | * struct stat64 has different sizes and some members are shifted |
| 30 | * Compatibility wrappers are needed for them and provided below. | 31 | * Compatibility wrappers are needed for them and provided below. |
| @@ -169,6 +170,29 @@ asmlinkage long sys_oabi_fstat64(unsigned long fd, | |||
| 169 | return error; | 170 | return error; |
| 170 | } | 171 | } |
| 171 | 172 | ||
| 173 | asmlinkage long sys_oabi_fstatat64(int dfd, | ||
| 174 | char __user *filename, | ||
| 175 | struct oldabi_stat64 __user *statbuf, | ||
| 176 | int flag) | ||
| 177 | { | ||
| 178 | struct kstat stat; | ||
| 179 | int error = -EINVAL; | ||
| 180 | |||
| 181 | if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0) | ||
| 182 | goto out; | ||
| 183 | |||
| 184 | if (flag & AT_SYMLINK_NOFOLLOW) | ||
| 185 | error = vfs_lstat_fd(dfd, filename, &stat); | ||
| 186 | else | ||
| 187 | error = vfs_stat_fd(dfd, filename, &stat); | ||
| 188 | |||
| 189 | if (!error) | ||
| 190 | error = cp_oldabi_stat64(&stat, statbuf); | ||
| 191 | |||
| 192 | out: | ||
| 193 | return error; | ||
| 194 | } | ||
| 195 | |||
| 172 | struct oabi_flock64 { | 196 | struct oabi_flock64 { |
| 173 | short l_type; | 197 | short l_type; |
| 174 | short l_whence; | 198 | short l_whence; |
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c index e66a07a928cd..2687b730e2d0 100644 --- a/arch/avr32/kernel/setup.c +++ b/arch/avr32/kernel/setup.c | |||
| @@ -163,6 +163,7 @@ add_reserved_region(resource_size_t start, resource_size_t end, | |||
| 163 | new->start = start; | 163 | new->start = start; |
| 164 | new->end = end; | 164 | new->end = end; |
| 165 | new->name = name; | 165 | new->name = name; |
| 166 | new->sibling = next; | ||
| 166 | new->flags = IORESOURCE_MEM; | 167 | new->flags = IORESOURCE_MEM; |
| 167 | 168 | ||
| 168 | *pprev = new; | 169 | *pprev = new; |
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c index cf6f686d9b0b..b835c4c01368 100644 --- a/arch/avr32/kernel/traps.c +++ b/arch/avr32/kernel/traps.c | |||
| @@ -178,6 +178,7 @@ static int do_cop_absent(u32 insn) | |||
| 178 | return 0; | 178 | return 0; |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | #ifdef CONFIG_BUG | ||
| 181 | int is_valid_bugaddr(unsigned long pc) | 182 | int is_valid_bugaddr(unsigned long pc) |
| 182 | { | 183 | { |
| 183 | unsigned short opcode; | 184 | unsigned short opcode; |
| @@ -189,6 +190,7 @@ int is_valid_bugaddr(unsigned long pc) | |||
| 189 | 190 | ||
| 190 | return opcode == AVR32_BUG_OPCODE; | 191 | return opcode == AVR32_BUG_OPCODE; |
| 191 | } | 192 | } |
| 193 | #endif | ||
| 192 | 194 | ||
| 193 | asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs) | 195 | asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs) |
| 194 | { | 196 | { |
| @@ -197,6 +199,7 @@ asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs) | |||
| 197 | void __user *pc; | 199 | void __user *pc; |
| 198 | long code; | 200 | long code; |
| 199 | 201 | ||
| 202 | #ifdef CONFIG_BUG | ||
| 200 | if (!user_mode(regs) && (ecr == ECR_ILLEGAL_OPCODE)) { | 203 | if (!user_mode(regs) && (ecr == ECR_ILLEGAL_OPCODE)) { |
| 201 | enum bug_trap_type type; | 204 | enum bug_trap_type type; |
| 202 | 205 | ||
| @@ -211,6 +214,7 @@ asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs) | |||
| 211 | die("Kernel BUG", regs, SIGKILL); | 214 | die("Kernel BUG", regs, SIGKILL); |
| 212 | } | 215 | } |
| 213 | } | 216 | } |
| 217 | #endif | ||
| 214 | 218 | ||
| 215 | local_irq_enable(); | 219 | local_irq_enable(); |
| 216 | 220 | ||
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 72097dacabd3..1c62381f5c23 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -482,10 +482,13 @@ endif | |||
| 482 | # be 16kb aligned or the handling of the current variable will break. | 482 | # be 16kb aligned or the handling of the current variable will break. |
| 483 | # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys | 483 | # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys |
| 484 | # | 484 | # |
| 485 | #core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/ arch/mips/arc/arc_con.o | 485 | ifdef CONFIG_SGI_IP28 |
| 486 | ifeq ($(call cc-option-yn,-mr10k-cache-barrier=1), n) | ||
| 487 | $(error gcc doesn't support needed option -mr10k-cache-barrier=1) | ||
| 488 | endif | ||
| 489 | endif | ||
| 486 | core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/ | 490 | core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/ |
| 487 | cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=1 -Iinclude/asm-mips/mach-ip28 | 491 | cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=1 -Iinclude/asm-mips/mach-ip28 |
| 488 | #cflags-$(CONFIG_SGI_IP28) += -Iinclude/asm-mips/mach-ip28 | ||
| 489 | load-$(CONFIG_SGI_IP28) += 0xa800000020004000 | 492 | load-$(CONFIG_SGI_IP28) += 0xa800000020004000 |
| 490 | 493 | ||
| 491 | # | 494 | # |
diff --git a/arch/mips/au1000/common/cputable.c b/arch/mips/au1000/common/cputable.c index d8df5fdb045f..5c0d35d6e22a 100644 --- a/arch/mips/au1000/common/cputable.c +++ b/arch/mips/au1000/common/cputable.c | |||
| @@ -22,24 +22,24 @@ struct cpu_spec* cur_cpu_spec[NR_CPUS]; | |||
| 22 | /* With some thought, we can probably use the mask to reduce the | 22 | /* With some thought, we can probably use the mask to reduce the |
| 23 | * size of the table. | 23 | * size of the table. |
| 24 | */ | 24 | */ |
| 25 | struct cpu_spec cpu_specs[] = { | 25 | struct cpu_spec cpu_specs[] = { |
| 26 | { 0xffffffff, 0x00030100, "Au1000 DA", 1, 0 }, | 26 | { 0xffffffff, 0x00030100, "Au1000 DA", 1, 0, 1 }, |
| 27 | { 0xffffffff, 0x00030201, "Au1000 HA", 1, 0 }, | 27 | { 0xffffffff, 0x00030201, "Au1000 HA", 1, 0, 1 }, |
| 28 | { 0xffffffff, 0x00030202, "Au1000 HB", 1, 0 }, | 28 | { 0xffffffff, 0x00030202, "Au1000 HB", 1, 0, 1 }, |
| 29 | { 0xffffffff, 0x00030203, "Au1000 HC", 1, 1 }, | 29 | { 0xffffffff, 0x00030203, "Au1000 HC", 1, 1, 0 }, |
| 30 | { 0xffffffff, 0x00030204, "Au1000 HD", 1, 1 }, | 30 | { 0xffffffff, 0x00030204, "Au1000 HD", 1, 1, 0 }, |
| 31 | { 0xffffffff, 0x01030200, "Au1500 AB", 1, 1 }, | 31 | { 0xffffffff, 0x01030200, "Au1500 AB", 1, 1, 0 }, |
| 32 | { 0xffffffff, 0x01030201, "Au1500 AC", 0, 1 }, | 32 | { 0xffffffff, 0x01030201, "Au1500 AC", 0, 1, 0 }, |
| 33 | { 0xffffffff, 0x01030202, "Au1500 AD", 0, 1 }, | 33 | { 0xffffffff, 0x01030202, "Au1500 AD", 0, 1, 0 }, |
| 34 | { 0xffffffff, 0x02030200, "Au1100 AB", 1, 1 }, | 34 | { 0xffffffff, 0x02030200, "Au1100 AB", 1, 1, 0 }, |
| 35 | { 0xffffffff, 0x02030201, "Au1100 BA", 1, 1 }, | 35 | { 0xffffffff, 0x02030201, "Au1100 BA", 1, 1, 0 }, |
| 36 | { 0xffffffff, 0x02030202, "Au1100 BC", 1, 1 }, | 36 | { 0xffffffff, 0x02030202, "Au1100 BC", 1, 1, 0 }, |
| 37 | { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 }, | 37 | { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1, 0 }, |
| 38 | { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 }, | 38 | { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1, 0 }, |
| 39 | { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 }, | 39 | { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1, 0 }, |
| 40 | { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0 }, | 40 | { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0, 0 }, |
| 41 | { 0xffffffff, 0x04030201, "Au1200 AC", 1, 0 }, | 41 | { 0xffffffff, 0x04030201, "Au1200 AC", 1, 0, 0 }, |
| 42 | { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 }, | 42 | { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0, 0 } |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | void | 45 | void |
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index d885e3848ec6..9e4ab80caab6 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
| @@ -57,7 +57,7 @@ void __init plat_mem_setup(void) | |||
| 57 | { | 57 | { |
| 58 | struct cpu_spec *sp; | 58 | struct cpu_spec *sp; |
| 59 | char *argptr; | 59 | char *argptr; |
| 60 | unsigned long prid, cpupll, bclk = 1; | 60 | unsigned long prid, cpufreq, bclk = 1; |
| 61 | 61 | ||
| 62 | set_cpuspec(); | 62 | set_cpuspec(); |
| 63 | sp = cur_cpu_spec[0]; | 63 | sp = cur_cpu_spec[0]; |
| @@ -65,8 +65,15 @@ void __init plat_mem_setup(void) | |||
| 65 | board_setup(); /* board specific setup */ | 65 | board_setup(); /* board specific setup */ |
| 66 | 66 | ||
| 67 | prid = read_c0_prid(); | 67 | prid = read_c0_prid(); |
| 68 | cpupll = (au_readl(0xB1900060) & 0x3F) * 12; | 68 | if (sp->cpu_pll_wo) |
| 69 | printk("(PRId %08lx) @ %ldMHZ\n", prid, cpupll); | 69 | #ifdef CONFIG_SOC_AU1000_FREQUENCY |
| 70 | cpufreq = CONFIG_SOC_AU1000_FREQUENCY / 1000000; | ||
| 71 | #else | ||
| 72 | cpufreq = 396; | ||
| 73 | #endif | ||
| 74 | else | ||
| 75 | cpufreq = (au_readl(SYS_CPUPLL) & 0x3F) * 12; | ||
| 76 | printk(KERN_INFO "(PRID %08lx) @ %ld MHz\n", prid, cpufreq); | ||
| 70 | 77 | ||
| 71 | bclk = sp->cpu_bclk; | 78 | bclk = sp->cpu_bclk; |
| 72 | if (bclk) | 79 | if (bclk) |
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index f113b512d7b1..e122bbc6cd88 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c | |||
| @@ -209,18 +209,22 @@ unsigned long cal_r4koff(void) | |||
| 209 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); | 209 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); |
| 210 | au_writel(0, SYS_TOYWRITE); | 210 | au_writel(0, SYS_TOYWRITE); |
| 211 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); | 211 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); |
| 212 | } else | ||
| 213 | no_au1xxx_32khz = 1; | ||
| 212 | 214 | ||
| 213 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * | 215 | /* |
| 214 | AU1000_SRC_CLK; | 216 | * On early Au1000, sys_cpupll was write-only. Since these |
| 215 | } | 217 | * silicon versions of Au1000 are not sold by AMD, we don't bend |
| 216 | else { | 218 | * over backwards trying to determine the frequency. |
| 217 | /* The 32KHz oscillator isn't running, so assume there | 219 | */ |
| 218 | * isn't one and grab the processor speed from the PLL. | 220 | if (cur_cpu_spec[0]->cpu_pll_wo) |
| 219 | * NOTE: some old silicon doesn't allow reading the PLL. | 221 | #ifdef CONFIG_SOC_AU1000_FREQUENCY |
| 220 | */ | 222 | cpu_speed = CONFIG_SOC_AU1000_FREQUENCY; |
| 223 | #else | ||
| 224 | cpu_speed = 396000000; | ||
| 225 | #endif | ||
| 226 | else | ||
| 221 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK; | 227 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK; |
| 222 | no_au1xxx_32khz = 1; | ||
| 223 | } | ||
| 224 | mips_hpt_frequency = cpu_speed; | 228 | mips_hpt_frequency = cpu_speed; |
| 225 | // Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16) | 229 | // Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16) |
| 226 | set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16)); | 230 | set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16)); |
diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c index a9237f41933d..b2e413e597a8 100644 --- a/arch/mips/au1000/xxs1500/board_setup.c +++ b/arch/mips/au1000/xxs1500/board_setup.c | |||
| @@ -33,11 +33,10 @@ | |||
| 33 | #include <asm/cpu.h> | 33 | #include <asm/cpu.h> |
| 34 | #include <asm/bootinfo.h> | 34 | #include <asm/bootinfo.h> |
| 35 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 36 | #include <asm/keyboard.h> | ||
| 37 | #include <asm/mipsregs.h> | 36 | #include <asm/mipsregs.h> |
| 38 | #include <asm/reboot.h> | 37 | #include <asm/reboot.h> |
| 39 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
| 40 | #include <asm/au1000.h> | 39 | #include <asm/mach-au1x00/au1000.h> |
| 41 | 40 | ||
| 42 | void board_reset(void) | 41 | void board_reset(void) |
| 43 | { | 42 | { |
diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/au1000/xxs1500/irqmap.c index 389349295d70..a343da134334 100644 --- a/arch/mips/au1000/xxs1500/irqmap.c +++ b/arch/mips/au1000/xxs1500/irqmap.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #include <asm/io.h> | 45 | #include <asm/io.h> |
| 46 | #include <asm/mipsregs.h> | 46 | #include <asm/mipsregs.h> |
| 47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
| 48 | #include <asm/au1000.h> | 48 | #include <asm/mach-au1x00/au1000.h> |
| 49 | 49 | ||
| 50 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { | 50 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
| 51 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, | 51 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index abf70d74e9d7..3b42cea2e402 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
| @@ -1,58 +1,48 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.25-rc7 |
| 4 | # Tue Feb 20 21:47:22 2007 | 4 | # Mon Mar 31 08:11:19 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_MIPS_MTX1 is not set | ||
| 13 | # CONFIG_MIPS_BOSPORUS is not set | ||
| 14 | # CONFIG_MIPS_PB1000 is not set | ||
| 15 | # CONFIG_MIPS_PB1100 is not set | ||
| 16 | # CONFIG_MIPS_PB1500 is not set | ||
| 17 | # CONFIG_MIPS_PB1550 is not set | ||
| 18 | # CONFIG_MIPS_PB1200 is not set | ||
| 19 | # CONFIG_MIPS_DB1000 is not set | ||
| 20 | # CONFIG_MIPS_DB1100 is not set | ||
| 21 | # CONFIG_MIPS_DB1500 is not set | ||
| 22 | # CONFIG_MIPS_DB1550 is not set | ||
| 23 | # CONFIG_MIPS_DB1200 is not set | ||
| 24 | # CONFIG_MIPS_MIRAGE is not set | ||
| 25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 18 | # CONFIG_LEMOTE_FULONG is not set | ||
| 29 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 30 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| 31 | # CONFIG_MIPS_SEAD is not set | 21 | # CONFIG_MIPS_SEAD is not set |
| 32 | # CONFIG_WR_PPMC is not set | ||
| 33 | # CONFIG_MIPS_SIM is not set | 22 | # CONFIG_MIPS_SIM is not set |
| 34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 23 | # CONFIG_MARKEINS is not set |
| 35 | # CONFIG_MIPS_XXS1500 is not set | 24 | # CONFIG_MACH_VR41XX is not set |
| 36 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 37 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 38 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
| 39 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 40 | # CONFIG_MARKEINS is not set | ||
| 41 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 42 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 43 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 44 | CONFIG_SIBYTE_BIGSUR=y | ||
| 45 | # CONFIG_SIBYTE_SWARM is not set | ||
| 46 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 47 | # CONFIG_SIBYTE_RHONE is not set | ||
| 48 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 49 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 50 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 34 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 51 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
| 36 | # CONFIG_SIBYTE_RHONE is not set | ||
| 37 | # CONFIG_SIBYTE_SWARM is not set | ||
| 38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 40 | CONFIG_SIBYTE_BIGSUR=y | ||
| 52 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 53 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
| 54 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 55 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 45 | # CONFIG_WR_PPMC is not set | ||
| 56 | CONFIG_SIBYTE_BCM1x80=y | 46 | CONFIG_SIBYTE_BCM1x80=y |
| 57 | CONFIG_SIBYTE_SB1xxx_SOC=y | 47 | CONFIG_SIBYTE_SB1xxx_SOC=y |
| 58 | # CONFIG_CPU_SB1_PASS_1 is not set | 48 | # CONFIG_CPU_SB1_PASS_1 is not set |
| @@ -68,9 +58,11 @@ CONFIG_SIBYTE_CFE=y | |||
| 68 | # CONFIG_SIBYTE_CFE_CONSOLE is not set | 58 | # CONFIG_SIBYTE_CFE_CONSOLE is not set |
| 69 | # CONFIG_SIBYTE_BUS_WATCHER is not set | 59 | # CONFIG_SIBYTE_BUS_WATCHER is not set |
| 70 | # CONFIG_SIBYTE_TBPROF is not set | 60 | # CONFIG_SIBYTE_TBPROF is not set |
| 61 | CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y | ||
| 71 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 62 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 72 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 63 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 73 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 64 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 65 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 74 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 66 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 75 | CONFIG_GENERIC_HWEIGHT=y | 67 | CONFIG_GENERIC_HWEIGHT=y |
| 76 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| @@ -81,11 +73,17 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
| 81 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 73 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 82 | CONFIG_CEVT_BCM1480=y | 74 | CONFIG_CEVT_BCM1480=y |
| 83 | CONFIG_CSRC_BCM1480=y | 75 | CONFIG_CSRC_BCM1480=y |
| 76 | CONFIG_CFE=y | ||
| 84 | CONFIG_DMA_COHERENT=y | 77 | CONFIG_DMA_COHERENT=y |
| 78 | CONFIG_EARLY_PRINTK=y | ||
| 79 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
| 80 | # CONFIG_HOTPLUG_CPU is not set | ||
| 81 | # CONFIG_NO_IOPORT is not set | ||
| 85 | CONFIG_CPU_BIG_ENDIAN=y | 82 | CONFIG_CPU_BIG_ENDIAN=y |
| 86 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 83 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 87 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 84 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 88 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 85 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 86 | CONFIG_IRQ_CPU=y | ||
| 89 | CONFIG_SWAP_IO_SPACE=y | 87 | CONFIG_SWAP_IO_SPACE=y |
| 90 | CONFIG_BOOT_ELF32=y | 88 | CONFIG_BOOT_ELF32=y |
| 91 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 89 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| @@ -93,10 +91,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 93 | # | 91 | # |
| 94 | # CPU selection | 92 | # CPU selection |
| 95 | # | 93 | # |
| 96 | CONFIG_TICK_ONESHOT=y | ||
| 97 | CONFIG_NO_HZ=y | ||
| 98 | CONFIG_HIGH_RES_TIMERS=y | ||
| 99 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 100 | # CONFIG_CPU_LOONGSON2 is not set | 94 | # CONFIG_CPU_LOONGSON2 is not set |
| 101 | # CONFIG_CPU_MIPS32_R1 is not set | 95 | # CONFIG_CPU_MIPS32_R1 is not set |
| 102 | # CONFIG_CPU_MIPS32_R2 is not set | 96 | # CONFIG_CPU_MIPS32_R2 is not set |
| @@ -137,14 +131,15 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 137 | CONFIG_MIPS_MT_DISABLED=y | 131 | CONFIG_MIPS_MT_DISABLED=y |
| 138 | # CONFIG_MIPS_MT_SMP is not set | 132 | # CONFIG_MIPS_MT_SMP is not set |
| 139 | # CONFIG_MIPS_MT_SMTC is not set | 133 | # CONFIG_MIPS_MT_SMTC is not set |
| 140 | # CONFIG_MIPS_VPE_LOADER is not set | ||
| 141 | CONFIG_CPU_HAS_LLSC=y | 134 | CONFIG_CPU_HAS_LLSC=y |
| 142 | CONFIG_CPU_HAS_SYNC=y | 135 | CONFIG_CPU_HAS_SYNC=y |
| 143 | CONFIG_GENERIC_HARDIRQS=y | 136 | CONFIG_GENERIC_HARDIRQS=y |
| 144 | CONFIG_GENERIC_IRQ_PROBE=y | 137 | CONFIG_GENERIC_IRQ_PROBE=y |
| 145 | CONFIG_IRQ_PER_CPU=y | 138 | CONFIG_IRQ_PER_CPU=y |
| 146 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 139 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 140 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | ||
| 147 | CONFIG_ARCH_FLATMEM_ENABLE=y | 141 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 142 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 148 | CONFIG_SELECT_MEMORY_MODEL=y | 143 | CONFIG_SELECT_MEMORY_MODEL=y |
| 149 | CONFIG_FLATMEM_MANUAL=y | 144 | CONFIG_FLATMEM_MANUAL=y |
| 150 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -152,13 +147,19 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 152 | CONFIG_FLATMEM=y | 147 | CONFIG_FLATMEM=y |
| 153 | CONFIG_FLAT_NODE_MEM_MAP=y | 148 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 154 | # CONFIG_SPARSEMEM_STATIC is not set | 149 | # CONFIG_SPARSEMEM_STATIC is not set |
| 150 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 151 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 156 | CONFIG_RESOURCES_64BIT=y | 152 | CONFIG_RESOURCES_64BIT=y |
| 157 | CONFIG_ZONE_DMA_FLAG=1 | 153 | CONFIG_ZONE_DMA_FLAG=0 |
| 154 | CONFIG_VIRT_TO_BUS=y | ||
| 158 | CONFIG_SMP=y | 155 | CONFIG_SMP=y |
| 159 | CONFIG_SYS_SUPPORTS_SMP=y | 156 | CONFIG_SYS_SUPPORTS_SMP=y |
| 160 | CONFIG_NR_CPUS_DEFAULT_4=y | 157 | CONFIG_NR_CPUS_DEFAULT_4=y |
| 161 | CONFIG_NR_CPUS=4 | 158 | CONFIG_NR_CPUS=4 |
| 159 | CONFIG_TICK_ONESHOT=y | ||
| 160 | CONFIG_NO_HZ=y | ||
| 161 | CONFIG_HIGH_RES_TIMERS=y | ||
| 162 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 162 | # CONFIG_HZ_48 is not set | 163 | # CONFIG_HZ_48 is not set |
| 163 | # CONFIG_HZ_100 is not set | 164 | # CONFIG_HZ_100 is not set |
| 164 | # CONFIG_HZ_128 is not set | 165 | # CONFIG_HZ_128 is not set |
| @@ -171,38 +172,45 @@ CONFIG_HZ=1000 | |||
| 171 | CONFIG_PREEMPT_NONE=y | 172 | CONFIG_PREEMPT_NONE=y |
| 172 | # CONFIG_PREEMPT_VOLUNTARY is not set | 173 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 173 | # CONFIG_PREEMPT is not set | 174 | # CONFIG_PREEMPT is not set |
| 174 | # CONFIG_PREEMPT_BKL is not set | ||
| 175 | # CONFIG_KEXEC is not set | 175 | # CONFIG_KEXEC is not set |
| 176 | CONFIG_SECCOMP=y | ||
| 176 | CONFIG_LOCKDEP_SUPPORT=y | 177 | CONFIG_LOCKDEP_SUPPORT=y |
| 177 | CONFIG_STACKTRACE_SUPPORT=y | 178 | CONFIG_STACKTRACE_SUPPORT=y |
| 178 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 179 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 179 | 180 | ||
| 180 | # | 181 | # |
| 181 | # Code maturity level options | 182 | # General setup |
| 182 | # | 183 | # |
| 183 | CONFIG_EXPERIMENTAL=y | 184 | CONFIG_EXPERIMENTAL=y |
| 184 | CONFIG_LOCK_KERNEL=y | 185 | CONFIG_LOCK_KERNEL=y |
| 185 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 186 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 186 | |||
| 187 | # | ||
| 188 | # General setup | ||
| 189 | # | ||
| 190 | CONFIG_LOCALVERSION="" | 187 | CONFIG_LOCALVERSION="" |
| 191 | CONFIG_LOCALVERSION_AUTO=y | 188 | CONFIG_LOCALVERSION_AUTO=y |
| 192 | CONFIG_SWAP=y | 189 | CONFIG_SWAP=y |
| 193 | CONFIG_SYSVIPC=y | 190 | CONFIG_SYSVIPC=y |
| 194 | # CONFIG_IPC_NS is not set | ||
| 195 | CONFIG_SYSVIPC_SYSCTL=y | 191 | CONFIG_SYSVIPC_SYSCTL=y |
| 196 | # CONFIG_POSIX_MQUEUE is not set | 192 | CONFIG_POSIX_MQUEUE=y |
| 197 | # CONFIG_BSD_PROCESS_ACCT is not set | 193 | CONFIG_BSD_PROCESS_ACCT=y |
| 198 | # CONFIG_TASKSTATS is not set | 194 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 199 | # CONFIG_UTS_NS is not set | 195 | CONFIG_TASKSTATS=y |
| 200 | # CONFIG_AUDIT is not set | 196 | CONFIG_TASK_DELAY_ACCT=y |
| 197 | CONFIG_TASK_XACCT=y | ||
| 198 | CONFIG_TASK_IO_ACCOUNTING=y | ||
| 199 | CONFIG_AUDIT=y | ||
| 201 | CONFIG_IKCONFIG=y | 200 | CONFIG_IKCONFIG=y |
| 202 | CONFIG_IKCONFIG_PROC=y | 201 | CONFIG_IKCONFIG_PROC=y |
| 203 | # CONFIG_CPUSETS is not set | 202 | CONFIG_LOG_BUF_SHIFT=16 |
| 203 | # CONFIG_CGROUPS is not set | ||
| 204 | CONFIG_GROUP_SCHED=y | ||
| 205 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 206 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 207 | CONFIG_USER_SCHED=y | ||
| 208 | # CONFIG_CGROUP_SCHED is not set | ||
| 204 | CONFIG_SYSFS_DEPRECATED=y | 209 | CONFIG_SYSFS_DEPRECATED=y |
| 205 | # CONFIG_RELAY is not set | 210 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 211 | CONFIG_RELAY=y | ||
| 212 | # CONFIG_NAMESPACES is not set | ||
| 213 | CONFIG_BLK_DEV_INITRD=y | ||
| 206 | CONFIG_INITRAMFS_SOURCE="" | 214 | CONFIG_INITRAMFS_SOURCE="" |
| 207 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 215 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 208 | CONFIG_SYSCTL=y | 216 | CONFIG_SYSCTL=y |
| @@ -211,24 +219,33 @@ CONFIG_EMBEDDED=y | |||
| 211 | CONFIG_KALLSYMS=y | 219 | CONFIG_KALLSYMS=y |
| 212 | # CONFIG_KALLSYMS_ALL is not set | 220 | # CONFIG_KALLSYMS_ALL is not set |
| 213 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 221 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 214 | # CONFIG_HOTPLUG is not set | 222 | CONFIG_HOTPLUG=y |
| 215 | CONFIG_PRINTK=y | 223 | CONFIG_PRINTK=y |
| 216 | CONFIG_BUG=y | 224 | CONFIG_BUG=y |
| 217 | CONFIG_ELF_CORE=y | 225 | CONFIG_ELF_CORE=y |
| 226 | CONFIG_COMPAT_BRK=y | ||
| 218 | CONFIG_BASE_FULL=y | 227 | CONFIG_BASE_FULL=y |
| 219 | CONFIG_FUTEX=y | 228 | CONFIG_FUTEX=y |
| 229 | CONFIG_ANON_INODES=y | ||
| 220 | CONFIG_EPOLL=y | 230 | CONFIG_EPOLL=y |
| 231 | CONFIG_SIGNALFD=y | ||
| 232 | CONFIG_TIMERFD=y | ||
| 233 | CONFIG_EVENTFD=y | ||
| 221 | CONFIG_SHMEM=y | 234 | CONFIG_SHMEM=y |
| 222 | CONFIG_SLAB=y | ||
| 223 | CONFIG_VM_EVENT_COUNTERS=y | 235 | CONFIG_VM_EVENT_COUNTERS=y |
| 236 | CONFIG_SLAB=y | ||
| 237 | # CONFIG_SLUB is not set | ||
| 238 | # CONFIG_SLOB is not set | ||
| 239 | # CONFIG_PROFILING is not set | ||
| 240 | # CONFIG_MARKERS is not set | ||
| 241 | CONFIG_HAVE_OPROFILE=y | ||
| 242 | # CONFIG_HAVE_KPROBES is not set | ||
| 243 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 244 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 245 | CONFIG_SLABINFO=y | ||
| 224 | CONFIG_RT_MUTEXES=y | 246 | CONFIG_RT_MUTEXES=y |
| 225 | # CONFIG_TINY_SHMEM is not set | 247 | # CONFIG_TINY_SHMEM is not set |
| 226 | CONFIG_BASE_SMALL=0 | 248 | CONFIG_BASE_SMALL=0 |
| 227 | # CONFIG_SLOB is not set | ||
| 228 | |||
| 229 | # | ||
| 230 | # Loadable module support | ||
| 231 | # | ||
| 232 | CONFIG_MODULES=y | 249 | CONFIG_MODULES=y |
| 233 | CONFIG_MODULE_UNLOAD=y | 250 | CONFIG_MODULE_UNLOAD=y |
| 234 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 251 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -236,12 +253,10 @@ CONFIG_MODVERSIONS=y | |||
| 236 | CONFIG_MODULE_SRCVERSION_ALL=y | 253 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 237 | CONFIG_KMOD=y | 254 | CONFIG_KMOD=y |
| 238 | CONFIG_STOP_MACHINE=y | 255 | CONFIG_STOP_MACHINE=y |
| 239 | |||
| 240 | # | ||
| 241 | # Block layer | ||
| 242 | # | ||
| 243 | CONFIG_BLOCK=y | 256 | CONFIG_BLOCK=y |
| 244 | # CONFIG_BLK_DEV_IO_TRACE is not set | 257 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 258 | # CONFIG_BLK_DEV_BSG is not set | ||
| 259 | CONFIG_BLOCK_COMPAT=y | ||
| 245 | 260 | ||
| 246 | # | 261 | # |
| 247 | # IO Schedulers | 262 | # IO Schedulers |
| @@ -255,6 +270,7 @@ CONFIG_DEFAULT_AS=y | |||
| 255 | # CONFIG_DEFAULT_CFQ is not set | 270 | # CONFIG_DEFAULT_CFQ is not set |
| 256 | # CONFIG_DEFAULT_NOOP is not set | 271 | # CONFIG_DEFAULT_NOOP is not set |
| 257 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 272 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 273 | CONFIG_CLASSIC_RCU=y | ||
| 258 | 274 | ||
| 259 | # | 275 | # |
| 260 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 276 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| @@ -262,23 +278,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 262 | CONFIG_HW_HAS_PCI=y | 278 | CONFIG_HW_HAS_PCI=y |
| 263 | CONFIG_PCI=y | 279 | CONFIG_PCI=y |
| 264 | CONFIG_PCI_DOMAINS=y | 280 | CONFIG_PCI_DOMAINS=y |
| 281 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 282 | CONFIG_PCI_LEGACY=y | ||
| 265 | CONFIG_PCI_DEBUG=y | 283 | CONFIG_PCI_DEBUG=y |
| 266 | CONFIG_MMU=y | 284 | CONFIG_MMU=y |
| 267 | 285 | CONFIG_ZONE_DMA32=y | |
| 268 | # | 286 | # CONFIG_PCCARD is not set |
| 269 | # PCCARD (PCMCIA/CardBus) support | 287 | # CONFIG_HOTPLUG_PCI is not set |
| 270 | # | ||
| 271 | |||
| 272 | # | ||
| 273 | # PCI Hotplug Support | ||
| 274 | # | ||
| 275 | 288 | ||
| 276 | # | 289 | # |
| 277 | # Executable file formats | 290 | # Executable file formats |
| 278 | # | 291 | # |
| 279 | CONFIG_BINFMT_ELF=y | 292 | CONFIG_BINFMT_ELF=y |
| 280 | # CONFIG_BINFMT_MISC is not set | 293 | # CONFIG_BINFMT_MISC is not set |
| 281 | # CONFIG_BUILD_ELF64 is not set | ||
| 282 | CONFIG_MIPS32_COMPAT=y | 294 | CONFIG_MIPS32_COMPAT=y |
| 283 | CONFIG_COMPAT=y | 295 | CONFIG_COMPAT=y |
| 284 | CONFIG_SYSVIPC_COMPAT=y | 296 | CONFIG_SYSVIPC_COMPAT=y |
| @@ -292,7 +304,6 @@ CONFIG_BINFMT_ELF32=y | |||
| 292 | CONFIG_PM=y | 304 | CONFIG_PM=y |
| 293 | # CONFIG_PM_LEGACY is not set | 305 | # CONFIG_PM_LEGACY is not set |
| 294 | # CONFIG_PM_DEBUG is not set | 306 | # CONFIG_PM_DEBUG is not set |
| 295 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
| 296 | 307 | ||
| 297 | # | 308 | # |
| 298 | # Networking | 309 | # Networking |
| @@ -302,7 +313,6 @@ CONFIG_NET=y | |||
| 302 | # | 313 | # |
| 303 | # Networking options | 314 | # Networking options |
| 304 | # | 315 | # |
| 305 | # CONFIG_NETDEBUG is not set | ||
| 306 | CONFIG_PACKET=y | 316 | CONFIG_PACKET=y |
| 307 | CONFIG_PACKET_MMAP=y | 317 | CONFIG_PACKET_MMAP=y |
| 308 | CONFIG_UNIX=y | 318 | CONFIG_UNIX=y |
| @@ -310,10 +320,11 @@ CONFIG_XFRM=y | |||
| 310 | CONFIG_XFRM_USER=m | 320 | CONFIG_XFRM_USER=m |
| 311 | # CONFIG_XFRM_SUB_POLICY is not set | 321 | # CONFIG_XFRM_SUB_POLICY is not set |
| 312 | CONFIG_XFRM_MIGRATE=y | 322 | CONFIG_XFRM_MIGRATE=y |
| 323 | # CONFIG_XFRM_STATISTICS is not set | ||
| 313 | CONFIG_NET_KEY=y | 324 | CONFIG_NET_KEY=y |
| 314 | CONFIG_NET_KEY_MIGRATE=y | 325 | CONFIG_NET_KEY_MIGRATE=y |
| 315 | CONFIG_INET=y | 326 | CONFIG_INET=y |
| 316 | # CONFIG_IP_MULTICAST is not set | 327 | CONFIG_IP_MULTICAST=y |
| 317 | # CONFIG_IP_ADVANCED_ROUTER is not set | 328 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 318 | CONFIG_IP_FIB_HASH=y | 329 | CONFIG_IP_FIB_HASH=y |
| 319 | CONFIG_IP_PNP=y | 330 | CONFIG_IP_PNP=y |
| @@ -322,41 +333,141 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 322 | # CONFIG_IP_PNP_RARP is not set | 333 | # CONFIG_IP_PNP_RARP is not set |
| 323 | # CONFIG_NET_IPIP is not set | 334 | # CONFIG_NET_IPIP is not set |
| 324 | # CONFIG_NET_IPGRE is not set | 335 | # CONFIG_NET_IPGRE is not set |
| 336 | CONFIG_IP_MROUTE=y | ||
| 337 | CONFIG_IP_PIMSM_V1=y | ||
| 338 | CONFIG_IP_PIMSM_V2=y | ||
| 325 | # CONFIG_ARPD is not set | 339 | # CONFIG_ARPD is not set |
| 326 | # CONFIG_SYN_COOKIES is not set | 340 | # CONFIG_SYN_COOKIES is not set |
| 327 | # CONFIG_INET_AH is not set | 341 | CONFIG_INET_AH=m |
| 328 | # CONFIG_INET_ESP is not set | 342 | CONFIG_INET_ESP=m |
| 329 | # CONFIG_INET_IPCOMP is not set | 343 | CONFIG_INET_IPCOMP=m |
| 330 | # CONFIG_INET_XFRM_TUNNEL is not set | 344 | CONFIG_INET_XFRM_TUNNEL=m |
| 331 | # CONFIG_INET_TUNNEL is not set | 345 | CONFIG_INET_TUNNEL=m |
| 332 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 346 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 333 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 347 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 334 | CONFIG_INET_XFRM_MODE_BEET=y | 348 | CONFIG_INET_XFRM_MODE_BEET=y |
| 349 | # CONFIG_INET_LRO is not set | ||
| 335 | CONFIG_INET_DIAG=y | 350 | CONFIG_INET_DIAG=y |
| 336 | CONFIG_INET_TCP_DIAG=y | 351 | CONFIG_INET_TCP_DIAG=y |
| 337 | # CONFIG_TCP_CONG_ADVANCED is not set | 352 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 338 | CONFIG_TCP_CONG_CUBIC=y | 353 | CONFIG_TCP_CONG_CUBIC=y |
| 339 | CONFIG_DEFAULT_TCP_CONG="cubic" | 354 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 340 | CONFIG_TCP_MD5SIG=y | 355 | CONFIG_TCP_MD5SIG=y |
| 341 | # CONFIG_IPV6 is not set | 356 | CONFIG_IP_VS=m |
| 342 | # CONFIG_INET6_XFRM_TUNNEL is not set | 357 | # CONFIG_IP_VS_DEBUG is not set |
| 343 | # CONFIG_INET6_TUNNEL is not set | 358 | CONFIG_IP_VS_TAB_BITS=12 |
| 359 | |||
| 360 | # | ||
| 361 | # IPVS transport protocol load balancing support | ||
| 362 | # | ||
| 363 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 364 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 365 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 366 | CONFIG_IP_VS_PROTO_AH=y | ||
| 367 | |||
| 368 | # | ||
| 369 | # IPVS scheduler | ||
| 370 | # | ||
| 371 | CONFIG_IP_VS_RR=m | ||
| 372 | CONFIG_IP_VS_WRR=m | ||
| 373 | CONFIG_IP_VS_LC=m | ||
| 374 | CONFIG_IP_VS_WLC=m | ||
| 375 | CONFIG_IP_VS_LBLC=m | ||
| 376 | CONFIG_IP_VS_LBLCR=m | ||
| 377 | CONFIG_IP_VS_DH=m | ||
| 378 | CONFIG_IP_VS_SH=m | ||
| 379 | CONFIG_IP_VS_SED=m | ||
| 380 | CONFIG_IP_VS_NQ=m | ||
| 381 | |||
| 382 | # | ||
| 383 | # IPVS application helper | ||
| 384 | # | ||
| 385 | CONFIG_IP_VS_FTP=m | ||
| 386 | CONFIG_IPV6=m | ||
| 387 | CONFIG_IPV6_PRIVACY=y | ||
| 388 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 389 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 390 | CONFIG_IPV6_OPTIMISTIC_DAD=y | ||
| 391 | CONFIG_INET6_AH=m | ||
| 392 | CONFIG_INET6_ESP=m | ||
| 393 | CONFIG_INET6_IPCOMP=m | ||
| 394 | CONFIG_IPV6_MIP6=m | ||
| 395 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 396 | CONFIG_INET6_TUNNEL=m | ||
| 397 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
| 398 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
| 399 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
| 400 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
| 401 | CONFIG_IPV6_SIT=m | ||
| 402 | CONFIG_IPV6_TUNNEL=m | ||
| 403 | CONFIG_IPV6_MULTIPLE_TABLES=y | ||
| 404 | CONFIG_IPV6_SUBTREES=y | ||
| 344 | CONFIG_NETWORK_SECMARK=y | 405 | CONFIG_NETWORK_SECMARK=y |
| 345 | # CONFIG_NETFILTER is not set | 406 | CONFIG_NETFILTER=y |
| 346 | 407 | # CONFIG_NETFILTER_DEBUG is not set | |
| 347 | # | 408 | # CONFIG_NETFILTER_ADVANCED is not set |
| 348 | # DCCP Configuration (EXPERIMENTAL) | 409 | |
| 349 | # | 410 | # |
| 411 | # Core Netfilter Configuration | ||
| 412 | # | ||
| 413 | CONFIG_NETFILTER_NETLINK=m | ||
| 414 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
| 415 | CONFIG_NF_CONNTRACK=m | ||
| 416 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
| 417 | CONFIG_NF_CONNTRACK_FTP=m | ||
| 418 | CONFIG_NF_CONNTRACK_IRC=m | ||
| 419 | CONFIG_NF_CONNTRACK_SIP=m | ||
| 420 | CONFIG_NF_CT_NETLINK=m | ||
| 421 | CONFIG_NETFILTER_XTABLES=m | ||
| 422 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
| 423 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
| 424 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | ||
| 425 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
| 426 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
| 427 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
| 428 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
| 429 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 430 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
| 431 | |||
| 432 | # | ||
| 433 | # IP: Netfilter Configuration | ||
| 434 | # | ||
| 435 | CONFIG_NF_CONNTRACK_IPV4=m | ||
| 436 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
| 437 | CONFIG_IP_NF_IPTABLES=m | ||
| 438 | CONFIG_IP_NF_FILTER=m | ||
| 439 | CONFIG_IP_NF_TARGET_REJECT=m | ||
| 440 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 441 | CONFIG_IP_NF_TARGET_ULOG=m | ||
| 442 | CONFIG_NF_NAT=m | ||
| 443 | CONFIG_NF_NAT_NEEDED=y | ||
| 444 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
| 445 | CONFIG_NF_NAT_FTP=m | ||
| 446 | CONFIG_NF_NAT_IRC=m | ||
| 447 | # CONFIG_NF_NAT_TFTP is not set | ||
| 448 | # CONFIG_NF_NAT_AMANDA is not set | ||
| 449 | # CONFIG_NF_NAT_PPTP is not set | ||
| 450 | # CONFIG_NF_NAT_H323 is not set | ||
| 451 | CONFIG_NF_NAT_SIP=m | ||
| 452 | CONFIG_IP_NF_MANGLE=m | ||
| 453 | |||
| 454 | # | ||
| 455 | # IPv6: Netfilter Configuration | ||
| 456 | # | ||
| 457 | CONFIG_NF_CONNTRACK_IPV6=m | ||
| 458 | CONFIG_IP6_NF_IPTABLES=m | ||
| 459 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | ||
| 460 | CONFIG_IP6_NF_FILTER=m | ||
| 461 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 462 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
| 463 | CONFIG_IP6_NF_MANGLE=m | ||
| 350 | # CONFIG_IP_DCCP is not set | 464 | # CONFIG_IP_DCCP is not set |
| 351 | 465 | CONFIG_IP_SCTP=m | |
| 352 | # | 466 | # CONFIG_SCTP_DBG_MSG is not set |
| 353 | # SCTP Configuration (EXPERIMENTAL) | 467 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| 354 | # | 468 | # CONFIG_SCTP_HMAC_NONE is not set |
| 355 | # CONFIG_IP_SCTP is not set | 469 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 356 | 470 | CONFIG_SCTP_HMAC_MD5=y | |
| 357 | # | ||
| 358 | # TIPC Configuration (EXPERIMENTAL) | ||
| 359 | # | ||
| 360 | # CONFIG_TIPC is not set | 471 | # CONFIG_TIPC is not set |
| 361 | # CONFIG_ATM is not set | 472 | # CONFIG_ATM is not set |
| 362 | # CONFIG_BRIDGE is not set | 473 | # CONFIG_BRIDGE is not set |
| @@ -369,10 +480,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 369 | # CONFIG_LAPB is not set | 480 | # CONFIG_LAPB is not set |
| 370 | # CONFIG_ECONET is not set | 481 | # CONFIG_ECONET is not set |
| 371 | # CONFIG_WAN_ROUTER is not set | 482 | # CONFIG_WAN_ROUTER is not set |
| 372 | |||
| 373 | # | ||
| 374 | # QoS and/or fair queueing | ||
| 375 | # | ||
| 376 | # CONFIG_NET_SCHED is not set | 483 | # CONFIG_NET_SCHED is not set |
| 377 | 484 | ||
| 378 | # | 485 | # |
| @@ -380,9 +487,21 @@ CONFIG_NETWORK_SECMARK=y | |||
| 380 | # | 487 | # |
| 381 | # CONFIG_NET_PKTGEN is not set | 488 | # CONFIG_NET_PKTGEN is not set |
| 382 | # CONFIG_HAMRADIO is not set | 489 | # CONFIG_HAMRADIO is not set |
| 490 | # CONFIG_CAN is not set | ||
| 383 | # CONFIG_IRDA is not set | 491 | # CONFIG_IRDA is not set |
| 384 | # CONFIG_BT is not set | 492 | # CONFIG_BT is not set |
| 493 | # CONFIG_AF_RXRPC is not set | ||
| 494 | CONFIG_FIB_RULES=y | ||
| 495 | |||
| 496 | # | ||
| 497 | # Wireless | ||
| 498 | # | ||
| 499 | # CONFIG_CFG80211 is not set | ||
| 500 | # CONFIG_WIRELESS_EXT is not set | ||
| 501 | # CONFIG_MAC80211 is not set | ||
| 385 | # CONFIG_IEEE80211 is not set | 502 | # CONFIG_IEEE80211 is not set |
| 503 | # CONFIG_RFKILL is not set | ||
| 504 | # CONFIG_NET_9P is not set | ||
| 386 | 505 | ||
| 387 | # | 506 | # |
| 388 | # Device Drivers | 507 | # Device Drivers |
| @@ -391,85 +510,70 @@ CONFIG_NETWORK_SECMARK=y | |||
| 391 | # | 510 | # |
| 392 | # Generic Driver Options | 511 | # Generic Driver Options |
| 393 | # | 512 | # |
| 513 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 394 | CONFIG_STANDALONE=y | 514 | CONFIG_STANDALONE=y |
| 395 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 515 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 516 | CONFIG_FW_LOADER=m | ||
| 396 | # CONFIG_DEBUG_DRIVER is not set | 517 | # CONFIG_DEBUG_DRIVER is not set |
| 397 | # CONFIG_DEBUG_DEVRES is not set | 518 | # CONFIG_DEBUG_DEVRES is not set |
| 398 | # CONFIG_SYS_HYPERVISOR is not set | 519 | # CONFIG_SYS_HYPERVISOR is not set |
| 399 | |||
| 400 | # | ||
| 401 | # Connector - unified userspace <-> kernelspace linker | ||
| 402 | # | ||
| 403 | # CONFIG_CONNECTOR is not set | 520 | # CONFIG_CONNECTOR is not set |
| 404 | |||
| 405 | # | ||
| 406 | # Memory Technology Devices (MTD) | ||
| 407 | # | ||
| 408 | # CONFIG_MTD is not set | 521 | # CONFIG_MTD is not set |
| 409 | |||
| 410 | # | ||
| 411 | # Parallel port support | ||
| 412 | # | ||
| 413 | # CONFIG_PARPORT is not set | 522 | # CONFIG_PARPORT is not set |
| 414 | 523 | CONFIG_BLK_DEV=y | |
| 415 | # | ||
| 416 | # Plug and Play support | ||
| 417 | # | ||
| 418 | # CONFIG_PNPACPI is not set | ||
| 419 | |||
| 420 | # | ||
| 421 | # Block devices | ||
| 422 | # | ||
| 423 | # CONFIG_BLK_CPQ_DA is not set | 524 | # CONFIG_BLK_CPQ_DA is not set |
| 424 | # CONFIG_BLK_CPQ_CISS_DA is not set | 525 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 425 | # CONFIG_BLK_DEV_DAC960 is not set | 526 | # CONFIG_BLK_DEV_DAC960 is not set |
| 426 | # CONFIG_BLK_DEV_UMEM is not set | 527 | # CONFIG_BLK_DEV_UMEM is not set |
| 427 | # CONFIG_BLK_DEV_COW_COMMON is not set | 528 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 428 | CONFIG_BLK_DEV_LOOP=m | 529 | CONFIG_BLK_DEV_LOOP=m |
| 429 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 530 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 430 | CONFIG_BLK_DEV_NBD=m | 531 | CONFIG_BLK_DEV_NBD=m |
| 431 | # CONFIG_BLK_DEV_SX8 is not set | 532 | # CONFIG_BLK_DEV_SX8 is not set |
| 432 | # CONFIG_BLK_DEV_RAM is not set | 533 | # CONFIG_BLK_DEV_RAM is not set |
| 433 | CONFIG_BLK_DEV_INITRD=y | ||
| 434 | # CONFIG_CDROM_PKTCDVD is not set | 534 | # CONFIG_CDROM_PKTCDVD is not set |
| 435 | # CONFIG_ATA_OVER_ETH is not set | 535 | # CONFIG_ATA_OVER_ETH is not set |
| 436 | 536 | CONFIG_MISC_DEVICES=y | |
| 437 | # | 537 | # CONFIG_PHANTOM is not set |
| 438 | # Misc devices | 538 | # CONFIG_EEPROM_93CX6 is not set |
| 439 | # | ||
| 440 | CONFIG_SGI_IOC4=m | 539 | CONFIG_SGI_IOC4=m |
| 441 | # CONFIG_TIFM_CORE is not set | 540 | # CONFIG_TIFM_CORE is not set |
| 442 | 541 | # CONFIG_ENCLOSURE_SERVICES is not set | |
| 443 | # | 542 | CONFIG_HAVE_IDE=y |
| 444 | # ATA/ATAPI/MFM/RLL support | ||
| 445 | # | ||
| 446 | CONFIG_IDE=y | 543 | CONFIG_IDE=y |
| 447 | CONFIG_IDE_MAX_HWIFS=4 | 544 | CONFIG_IDE_MAX_HWIFS=4 |
| 448 | CONFIG_BLK_DEV_IDE=y | 545 | CONFIG_BLK_DEV_IDE=y |
| 449 | 546 | ||
| 450 | # | 547 | # |
| 451 | # Please see Documentation/ide.txt for help/info on IDE drives | 548 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 452 | # | 549 | # |
| 453 | # CONFIG_BLK_DEV_IDE_SATA is not set | 550 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 454 | CONFIG_BLK_DEV_IDEDISK=y | 551 | CONFIG_BLK_DEV_IDEDISK=y |
| 455 | # CONFIG_IDEDISK_MULTI_MODE is not set | 552 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| 456 | CONFIG_BLK_DEV_IDECD=y | 553 | CONFIG_BLK_DEV_IDECD=y |
| 554 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 457 | CONFIG_BLK_DEV_IDETAPE=y | 555 | CONFIG_BLK_DEV_IDETAPE=y |
| 458 | CONFIG_BLK_DEV_IDEFLOPPY=y | 556 | CONFIG_BLK_DEV_IDEFLOPPY=y |
| 557 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 459 | # CONFIG_IDE_TASK_IOCTL is not set | 558 | # CONFIG_IDE_TASK_IOCTL is not set |
| 559 | CONFIG_IDE_PROC_FS=y | ||
| 460 | 560 | ||
| 461 | # | 561 | # |
| 462 | # IDE chipset support/bugfixes | 562 | # IDE chipset support/bugfixes |
| 463 | # | 563 | # |
| 464 | CONFIG_IDE_GENERIC=y | 564 | CONFIG_IDE_GENERIC=y |
| 565 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
| 566 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
| 567 | |||
| 568 | # | ||
| 569 | # PCI IDE chipsets support | ||
| 570 | # | ||
| 465 | CONFIG_BLK_DEV_IDEPCI=y | 571 | CONFIG_BLK_DEV_IDEPCI=y |
| 466 | # CONFIG_IDEPCI_SHARE_IRQ is not set | 572 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
| 467 | # CONFIG_BLK_DEV_OFFBOARD is not set | 573 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 468 | CONFIG_BLK_DEV_GENERIC=y | 574 | CONFIG_BLK_DEV_GENERIC=y |
| 469 | # CONFIG_BLK_DEV_OPTI621 is not set | 575 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 470 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 576 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 471 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 472 | # CONFIG_IDEDMA_PCI_AUTO is not set | ||
| 473 | # CONFIG_BLK_DEV_AEC62XX is not set | 577 | # CONFIG_BLK_DEV_AEC62XX is not set |
| 474 | # CONFIG_BLK_DEV_ALI15X3 is not set | 578 | # CONFIG_BLK_DEV_ALI15X3 is not set |
| 475 | # CONFIG_BLK_DEV_AMD74XX is not set | 579 | # CONFIG_BLK_DEV_AMD74XX is not set |
| @@ -495,87 +599,196 @@ CONFIG_BLK_DEV_IT8213=m | |||
| 495 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 599 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 496 | CONFIG_BLK_DEV_TC86C001=m | 600 | CONFIG_BLK_DEV_TC86C001=m |
| 497 | # CONFIG_BLK_DEV_IDE_SWARM is not set | 601 | # CONFIG_BLK_DEV_IDE_SWARM is not set |
| 498 | # CONFIG_IDE_ARM is not set | ||
| 499 | CONFIG_BLK_DEV_IDEDMA=y | 602 | CONFIG_BLK_DEV_IDEDMA=y |
| 500 | # CONFIG_IDEDMA_IVB is not set | 603 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y |
| 501 | # CONFIG_IDEDMA_AUTO is not set | ||
| 502 | # CONFIG_BLK_DEV_HD is not set | 604 | # CONFIG_BLK_DEV_HD is not set |
| 503 | 605 | ||
| 504 | # | 606 | # |
| 505 | # SCSI device support | 607 | # SCSI device support |
| 506 | # | 608 | # |
| 507 | # CONFIG_RAID_ATTRS is not set | 609 | # CONFIG_RAID_ATTRS is not set |
| 508 | # CONFIG_SCSI is not set | 610 | CONFIG_SCSI=y |
| 611 | CONFIG_SCSI_DMA=y | ||
| 612 | # CONFIG_SCSI_TGT is not set | ||
| 509 | # CONFIG_SCSI_NETLINK is not set | 613 | # CONFIG_SCSI_NETLINK is not set |
| 510 | 614 | CONFIG_SCSI_PROC_FS=y | |
| 511 | # | 615 | |
| 512 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | 616 | # |
| 513 | # | 617 | # SCSI support type (disk, tape, CD-ROM) |
| 514 | # CONFIG_ATA is not set | 618 | # |
| 515 | 619 | CONFIG_BLK_DEV_SD=y | |
| 516 | # | 620 | # CONFIG_CHR_DEV_ST is not set |
| 517 | # Multi-device support (RAID and LVM) | 621 | # CONFIG_CHR_DEV_OSST is not set |
| 518 | # | 622 | # CONFIG_BLK_DEV_SR is not set |
| 623 | # CONFIG_CHR_DEV_SG is not set | ||
| 624 | # CONFIG_CHR_DEV_SCH is not set | ||
| 625 | |||
| 626 | # | ||
| 627 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 628 | # | ||
| 629 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 630 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 631 | # CONFIG_SCSI_LOGGING is not set | ||
| 632 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 633 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 634 | |||
| 635 | # | ||
| 636 | # SCSI Transports | ||
| 637 | # | ||
| 638 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 639 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 640 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 641 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 642 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 643 | CONFIG_SCSI_LOWLEVEL=y | ||
| 644 | # CONFIG_ISCSI_TCP is not set | ||
| 645 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 646 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 647 | # CONFIG_SCSI_ACARD is not set | ||
| 648 | # CONFIG_SCSI_AACRAID is not set | ||
| 649 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 650 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 651 | # CONFIG_SCSI_AIC79XX is not set | ||
| 652 | # CONFIG_SCSI_AIC94XX is not set | ||
| 653 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 654 | # CONFIG_SCSI_ARCMSR is not set | ||
| 655 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 656 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 657 | # CONFIG_MEGARAID_SAS is not set | ||
| 658 | # CONFIG_SCSI_HPTIOP is not set | ||
| 659 | # CONFIG_SCSI_DMX3191D is not set | ||
| 660 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 661 | # CONFIG_SCSI_IPS is not set | ||
| 662 | # CONFIG_SCSI_INITIO is not set | ||
| 663 | # CONFIG_SCSI_INIA100 is not set | ||
| 664 | # CONFIG_SCSI_MVSAS is not set | ||
| 665 | # CONFIG_SCSI_STEX is not set | ||
| 666 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 667 | # CONFIG_SCSI_IPR is not set | ||
| 668 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 669 | # CONFIG_SCSI_QLA_FC is not set | ||
| 670 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 671 | # CONFIG_SCSI_LPFC is not set | ||
| 672 | # CONFIG_SCSI_DC395x is not set | ||
| 673 | # CONFIG_SCSI_DC390T is not set | ||
| 674 | # CONFIG_SCSI_DEBUG is not set | ||
| 675 | # CONFIG_SCSI_SRP is not set | ||
| 676 | CONFIG_ATA=y | ||
| 677 | # CONFIG_ATA_NONSTANDARD is not set | ||
| 678 | # CONFIG_SATA_AHCI is not set | ||
| 679 | # CONFIG_SATA_SVW is not set | ||
| 680 | # CONFIG_ATA_PIIX is not set | ||
| 681 | # CONFIG_SATA_MV is not set | ||
| 682 | # CONFIG_SATA_NV is not set | ||
| 683 | # CONFIG_PDC_ADMA is not set | ||
| 684 | # CONFIG_SATA_QSTOR is not set | ||
| 685 | # CONFIG_SATA_PROMISE is not set | ||
| 686 | # CONFIG_SATA_SX4 is not set | ||
| 687 | # CONFIG_SATA_SIL is not set | ||
| 688 | CONFIG_SATA_SIL24=y | ||
| 689 | # CONFIG_SATA_SIS is not set | ||
| 690 | # CONFIG_SATA_ULI is not set | ||
| 691 | # CONFIG_SATA_VIA is not set | ||
| 692 | # CONFIG_SATA_VITESSE is not set | ||
| 693 | # CONFIG_SATA_INIC162X is not set | ||
| 694 | # CONFIG_PATA_ALI is not set | ||
| 695 | # CONFIG_PATA_AMD is not set | ||
| 696 | # CONFIG_PATA_ARTOP is not set | ||
| 697 | # CONFIG_PATA_ATIIXP is not set | ||
| 698 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 699 | # CONFIG_PATA_CMD64X is not set | ||
| 700 | # CONFIG_PATA_CS5520 is not set | ||
| 701 | # CONFIG_PATA_CS5530 is not set | ||
| 702 | # CONFIG_PATA_CYPRESS is not set | ||
| 703 | # CONFIG_PATA_EFAR is not set | ||
| 704 | # CONFIG_ATA_GENERIC is not set | ||
| 705 | # CONFIG_PATA_HPT366 is not set | ||
| 706 | # CONFIG_PATA_HPT37X is not set | ||
| 707 | # CONFIG_PATA_HPT3X2N is not set | ||
| 708 | # CONFIG_PATA_HPT3X3 is not set | ||
| 709 | # CONFIG_PATA_IT821X is not set | ||
| 710 | # CONFIG_PATA_IT8213 is not set | ||
| 711 | # CONFIG_PATA_JMICRON is not set | ||
| 712 | # CONFIG_PATA_TRIFLEX is not set | ||
| 713 | # CONFIG_PATA_MARVELL is not set | ||
| 714 | # CONFIG_PATA_MPIIX is not set | ||
| 715 | # CONFIG_PATA_OLDPIIX is not set | ||
| 716 | # CONFIG_PATA_NETCELL is not set | ||
| 717 | # CONFIG_PATA_NINJA32 is not set | ||
| 718 | # CONFIG_PATA_NS87410 is not set | ||
| 719 | # CONFIG_PATA_NS87415 is not set | ||
| 720 | # CONFIG_PATA_OPTI is not set | ||
| 721 | # CONFIG_PATA_OPTIDMA is not set | ||
| 722 | # CONFIG_PATA_PDC_OLD is not set | ||
| 723 | # CONFIG_PATA_RADISYS is not set | ||
| 724 | # CONFIG_PATA_RZ1000 is not set | ||
| 725 | # CONFIG_PATA_SC1200 is not set | ||
| 726 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 727 | # CONFIG_PATA_PDC2027X is not set | ||
| 728 | CONFIG_PATA_SIL680=y | ||
| 729 | # CONFIG_PATA_SIS is not set | ||
| 730 | # CONFIG_PATA_VIA is not set | ||
| 731 | # CONFIG_PATA_WINBOND is not set | ||
| 732 | # CONFIG_PATA_PLATFORM is not set | ||
| 519 | # CONFIG_MD is not set | 733 | # CONFIG_MD is not set |
| 520 | |||
| 521 | # | ||
| 522 | # Fusion MPT device support | ||
| 523 | # | ||
| 524 | # CONFIG_FUSION is not set | 734 | # CONFIG_FUSION is not set |
| 525 | 735 | ||
| 526 | # | 736 | # |
| 527 | # IEEE 1394 (FireWire) support | 737 | # IEEE 1394 (FireWire) support |
| 528 | # | 738 | # |
| 739 | # CONFIG_FIREWIRE is not set | ||
| 529 | # CONFIG_IEEE1394 is not set | 740 | # CONFIG_IEEE1394 is not set |
| 530 | |||
| 531 | # | ||
| 532 | # I2O device support | ||
| 533 | # | ||
| 534 | # CONFIG_I2O is not set | 741 | # CONFIG_I2O is not set |
| 535 | |||
| 536 | # | ||
| 537 | # Network device support | ||
| 538 | # | ||
| 539 | CONFIG_NETDEVICES=y | 742 | CONFIG_NETDEVICES=y |
| 743 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 540 | # CONFIG_DUMMY is not set | 744 | # CONFIG_DUMMY is not set |
| 541 | # CONFIG_BONDING is not set | 745 | # CONFIG_BONDING is not set |
| 746 | # CONFIG_MACVLAN is not set | ||
| 542 | # CONFIG_EQUALIZER is not set | 747 | # CONFIG_EQUALIZER is not set |
| 543 | # CONFIG_TUN is not set | 748 | # CONFIG_TUN is not set |
| 544 | 749 | # CONFIG_VETH is not set | |
| 545 | # | ||
| 546 | # ARCnet devices | ||
| 547 | # | ||
| 548 | # CONFIG_ARCNET is not set | 750 | # CONFIG_ARCNET is not set |
| 549 | 751 | CONFIG_PHYLIB=y | |
| 550 | # | 752 | |
| 551 | # PHY device support | 753 | # |
| 552 | # | 754 | # MII PHY device drivers |
| 553 | # CONFIG_PHYLIB is not set | 755 | # |
| 554 | 756 | # CONFIG_MARVELL_PHY is not set | |
| 555 | # | 757 | # CONFIG_DAVICOM_PHY is not set |
| 556 | # Ethernet (10 or 100Mbit) | 758 | # CONFIG_QSEMI_PHY is not set |
| 557 | # | 759 | # CONFIG_LXT_PHY is not set |
| 760 | # CONFIG_CICADA_PHY is not set | ||
| 761 | # CONFIG_VITESSE_PHY is not set | ||
| 762 | # CONFIG_SMSC_PHY is not set | ||
| 763 | # CONFIG_BROADCOM_PHY is not set | ||
| 764 | # CONFIG_ICPLUS_PHY is not set | ||
| 765 | # CONFIG_REALTEK_PHY is not set | ||
| 766 | # CONFIG_FIXED_PHY is not set | ||
| 767 | # CONFIG_MDIO_BITBANG is not set | ||
| 558 | CONFIG_NET_ETHERNET=y | 768 | CONFIG_NET_ETHERNET=y |
| 559 | CONFIG_MII=y | 769 | CONFIG_MII=y |
| 770 | # CONFIG_AX88796 is not set | ||
| 560 | # CONFIG_HAPPYMEAL is not set | 771 | # CONFIG_HAPPYMEAL is not set |
| 561 | # CONFIG_SUNGEM is not set | 772 | # CONFIG_SUNGEM is not set |
| 562 | # CONFIG_CASSINI is not set | 773 | # CONFIG_CASSINI is not set |
| 563 | # CONFIG_NET_VENDOR_3COM is not set | 774 | # CONFIG_NET_VENDOR_3COM is not set |
| 564 | # CONFIG_DM9000 is not set | 775 | # CONFIG_DM9000 is not set |
| 565 | |||
| 566 | # | ||
| 567 | # Tulip family network device support | ||
| 568 | # | ||
| 569 | # CONFIG_NET_TULIP is not set | 776 | # CONFIG_NET_TULIP is not set |
| 570 | # CONFIG_HP100 is not set | 777 | # CONFIG_HP100 is not set |
| 778 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 779 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 780 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 781 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 571 | # CONFIG_NET_PCI is not set | 782 | # CONFIG_NET_PCI is not set |
| 572 | 783 | # CONFIG_B44 is not set | |
| 573 | # | 784 | CONFIG_NETDEV_1000=y |
| 574 | # Ethernet (1000 Mbit) | ||
| 575 | # | ||
| 576 | # CONFIG_ACENIC is not set | 785 | # CONFIG_ACENIC is not set |
| 577 | # CONFIG_DL2K is not set | 786 | # CONFIG_DL2K is not set |
| 578 | # CONFIG_E1000 is not set | 787 | # CONFIG_E1000 is not set |
| 788 | # CONFIG_E1000E is not set | ||
| 789 | # CONFIG_E1000E_ENABLED is not set | ||
| 790 | # CONFIG_IP1000 is not set | ||
| 791 | # CONFIG_IGB is not set | ||
| 579 | # CONFIG_NS83820 is not set | 792 | # CONFIG_NS83820 is not set |
| 580 | # CONFIG_HAMACHI is not set | 793 | # CONFIG_HAMACHI is not set |
| 581 | # CONFIG_YELLOWFIN is not set | 794 | # CONFIG_YELLOWFIN is not set |
| @@ -585,52 +798,53 @@ CONFIG_SB1250_MAC=y | |||
| 585 | # CONFIG_SKGE is not set | 798 | # CONFIG_SKGE is not set |
| 586 | # CONFIG_SKY2 is not set | 799 | # CONFIG_SKY2 is not set |
| 587 | # CONFIG_SK98LIN is not set | 800 | # CONFIG_SK98LIN is not set |
| 801 | # CONFIG_VIA_VELOCITY is not set | ||
| 588 | # CONFIG_TIGON3 is not set | 802 | # CONFIG_TIGON3 is not set |
| 589 | # CONFIG_BNX2 is not set | 803 | # CONFIG_BNX2 is not set |
| 590 | # CONFIG_QLA3XXX is not set | 804 | # CONFIG_QLA3XXX is not set |
| 591 | # CONFIG_ATL1 is not set | 805 | # CONFIG_ATL1 is not set |
| 592 | 806 | CONFIG_NETDEV_10000=y | |
| 593 | # | ||
| 594 | # Ethernet (10000 Mbit) | ||
| 595 | # | ||
| 596 | # CONFIG_CHELSIO_T1 is not set | 807 | # CONFIG_CHELSIO_T1 is not set |
| 597 | CONFIG_CHELSIO_T3=m | 808 | CONFIG_CHELSIO_T3=m |
| 809 | # CONFIG_IXGBE is not set | ||
| 598 | # CONFIG_IXGB is not set | 810 | # CONFIG_IXGB is not set |
| 599 | # CONFIG_S2IO is not set | 811 | # CONFIG_S2IO is not set |
| 600 | # CONFIG_MYRI10GE is not set | 812 | # CONFIG_MYRI10GE is not set |
| 601 | CONFIG_NETXEN_NIC=m | 813 | CONFIG_NETXEN_NIC=m |
| 602 | 814 | # CONFIG_NIU is not set | |
| 603 | # | 815 | # CONFIG_MLX4_CORE is not set |
| 604 | # Token Ring devices | 816 | # CONFIG_TEHUTI is not set |
| 605 | # | 817 | # CONFIG_BNX2X is not set |
| 606 | # CONFIG_TR is not set | 818 | # CONFIG_TR is not set |
| 607 | 819 | ||
| 608 | # | 820 | # |
| 609 | # Wireless LAN (non-hamradio) | 821 | # Wireless LAN |
| 610 | # | ||
| 611 | # CONFIG_NET_RADIO is not set | ||
| 612 | |||
| 613 | # | ||
| 614 | # Wan interfaces | ||
| 615 | # | 822 | # |
| 823 | # CONFIG_WLAN_PRE80211 is not set | ||
| 824 | # CONFIG_WLAN_80211 is not set | ||
| 616 | # CONFIG_WAN is not set | 825 | # CONFIG_WAN is not set |
| 617 | # CONFIG_FDDI is not set | 826 | # CONFIG_FDDI is not set |
| 618 | # CONFIG_HIPPI is not set | 827 | # CONFIG_HIPPI is not set |
| 619 | # CONFIG_PPP is not set | 828 | CONFIG_PPP=m |
| 620 | # CONFIG_SLIP is not set | 829 | CONFIG_PPP_MULTILINK=y |
| 621 | # CONFIG_SHAPER is not set | 830 | CONFIG_PPP_FILTER=y |
| 831 | CONFIG_PPP_ASYNC=m | ||
| 832 | CONFIG_PPP_SYNC_TTY=m | ||
| 833 | CONFIG_PPP_DEFLATE=m | ||
| 834 | CONFIG_PPP_BSDCOMP=m | ||
| 835 | CONFIG_PPP_MPPE=m | ||
| 836 | CONFIG_PPPOE=m | ||
| 837 | CONFIG_PPPOL2TP=m | ||
| 838 | CONFIG_SLIP=m | ||
| 839 | CONFIG_SLIP_COMPRESSED=y | ||
| 840 | CONFIG_SLHC=m | ||
| 841 | CONFIG_SLIP_SMART=y | ||
| 842 | CONFIG_SLIP_MODE_SLIP6=y | ||
| 843 | # CONFIG_NET_FC is not set | ||
| 622 | # CONFIG_NETCONSOLE is not set | 844 | # CONFIG_NETCONSOLE is not set |
| 623 | # CONFIG_NETPOLL is not set | 845 | # CONFIG_NETPOLL is not set |
| 624 | # CONFIG_NET_POLL_CONTROLLER is not set | 846 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 625 | |||
| 626 | # | ||
| 627 | # ISDN subsystem | ||
| 628 | # | ||
| 629 | # CONFIG_ISDN is not set | 847 | # CONFIG_ISDN is not set |
| 630 | |||
| 631 | # | ||
| 632 | # Telephony Support | ||
| 633 | # | ||
| 634 | # CONFIG_PHONE is not set | 848 | # CONFIG_PHONE is not set |
| 635 | 849 | ||
| 636 | # | 850 | # |
| @@ -660,17 +874,16 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
| 660 | # CONFIG_DIGIEPCA is not set | 874 | # CONFIG_DIGIEPCA is not set |
| 661 | # CONFIG_MOXA_INTELLIO is not set | 875 | # CONFIG_MOXA_INTELLIO is not set |
| 662 | # CONFIG_MOXA_SMARTIO is not set | 876 | # CONFIG_MOXA_SMARTIO is not set |
| 663 | CONFIG_MOXA_SMARTIO_NEW=m | ||
| 664 | # CONFIG_ISI is not set | 877 | # CONFIG_ISI is not set |
| 665 | # CONFIG_SYNCLINKMP is not set | 878 | # CONFIG_SYNCLINKMP is not set |
| 666 | # CONFIG_SYNCLINK_GT is not set | 879 | # CONFIG_SYNCLINK_GT is not set |
| 667 | # CONFIG_N_HDLC is not set | 880 | # CONFIG_N_HDLC is not set |
| 881 | # CONFIG_RISCOM8 is not set | ||
| 668 | # CONFIG_SPECIALIX is not set | 882 | # CONFIG_SPECIALIX is not set |
| 669 | # CONFIG_SX is not set | 883 | # CONFIG_SX is not set |
| 670 | # CONFIG_RIO is not set | 884 | # CONFIG_RIO is not set |
| 671 | # CONFIG_STALDRV is not set | 885 | # CONFIG_STALDRV is not set |
| 672 | CONFIG_SERIAL_SB1250_DUART=y | 886 | # CONFIG_NOZOMI is not set |
| 673 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
| 674 | 887 | ||
| 675 | # | 888 | # |
| 676 | # Serial drivers | 889 | # Serial drivers |
| @@ -680,39 +893,24 @@ CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | |||
| 680 | # | 893 | # |
| 681 | # Non-8250 serial port support | 894 | # Non-8250 serial port support |
| 682 | # | 895 | # |
| 896 | CONFIG_SERIAL_SB1250_DUART=y | ||
| 897 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
| 898 | CONFIG_SERIAL_CORE=y | ||
| 899 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 683 | # CONFIG_SERIAL_JSM is not set | 900 | # CONFIG_SERIAL_JSM is not set |
| 684 | CONFIG_UNIX98_PTYS=y | 901 | CONFIG_UNIX98_PTYS=y |
| 685 | CONFIG_LEGACY_PTYS=y | 902 | CONFIG_LEGACY_PTYS=y |
| 686 | CONFIG_LEGACY_PTY_COUNT=256 | 903 | CONFIG_LEGACY_PTY_COUNT=256 |
| 687 | |||
| 688 | # | ||
| 689 | # IPMI | ||
| 690 | # | ||
| 691 | # CONFIG_IPMI_HANDLER is not set | 904 | # CONFIG_IPMI_HANDLER is not set |
| 692 | |||
| 693 | # | ||
| 694 | # Watchdog Cards | ||
| 695 | # | ||
| 696 | # CONFIG_WATCHDOG is not set | ||
| 697 | # CONFIG_HW_RANDOM is not set | 905 | # CONFIG_HW_RANDOM is not set |
| 698 | # CONFIG_RTC is not set | 906 | # CONFIG_RTC is not set |
| 699 | CONFIG_GEN_RTC=y | ||
| 700 | # CONFIG_GEN_RTC_X is not set | ||
| 701 | # CONFIG_DTLK is not set | ||
| 702 | # CONFIG_R3964 is not set | 907 | # CONFIG_R3964 is not set |
| 703 | # CONFIG_APPLICOM is not set | 908 | # CONFIG_APPLICOM is not set |
| 704 | # CONFIG_DRM is not set | ||
| 705 | # CONFIG_RAW_DRIVER is not set | 909 | # CONFIG_RAW_DRIVER is not set |
| 706 | |||
| 707 | # | ||
| 708 | # TPM devices | ||
| 709 | # | ||
| 710 | # CONFIG_TCG_TPM is not set | 910 | # CONFIG_TCG_TPM is not set |
| 711 | 911 | CONFIG_DEVPORT=y | |
| 712 | # | ||
| 713 | # I2C support | ||
| 714 | # | ||
| 715 | CONFIG_I2C=y | 912 | CONFIG_I2C=y |
| 913 | CONFIG_I2C_BOARDINFO=y | ||
| 716 | CONFIG_I2C_CHARDEV=y | 914 | CONFIG_I2C_CHARDEV=y |
| 717 | 915 | ||
| 718 | # | 916 | # |
| @@ -736,29 +934,30 @@ CONFIG_I2C_CHARDEV=y | |||
| 736 | # CONFIG_I2C_NFORCE2 is not set | 934 | # CONFIG_I2C_NFORCE2 is not set |
| 737 | # CONFIG_I2C_OCORES is not set | 935 | # CONFIG_I2C_OCORES is not set |
| 738 | # CONFIG_I2C_PARPORT_LIGHT is not set | 936 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 739 | # CONFIG_I2C_PASEMI is not set | ||
| 740 | # CONFIG_I2C_PROSAVAGE is not set | 937 | # CONFIG_I2C_PROSAVAGE is not set |
| 741 | # CONFIG_I2C_SAVAGE4 is not set | 938 | # CONFIG_I2C_SAVAGE4 is not set |
| 742 | CONFIG_I2C_SIBYTE=y | 939 | CONFIG_I2C_SIBYTE=y |
| 940 | # CONFIG_I2C_SIMTEC is not set | ||
| 743 | # CONFIG_I2C_SIS5595 is not set | 941 | # CONFIG_I2C_SIS5595 is not set |
| 744 | # CONFIG_I2C_SIS630 is not set | 942 | # CONFIG_I2C_SIS630 is not set |
| 745 | # CONFIG_I2C_SIS96X is not set | 943 | # CONFIG_I2C_SIS96X is not set |
| 944 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 746 | # CONFIG_I2C_STUB is not set | 945 | # CONFIG_I2C_STUB is not set |
| 747 | # CONFIG_I2C_VIA is not set | 946 | # CONFIG_I2C_VIA is not set |
| 748 | # CONFIG_I2C_VIAPRO is not set | 947 | # CONFIG_I2C_VIAPRO is not set |
| 749 | # CONFIG_I2C_VOODOO3 is not set | 948 | # CONFIG_I2C_VOODOO3 is not set |
| 750 | # CONFIG_I2C_PCA_ISA is not set | ||
| 751 | 949 | ||
| 752 | # | 950 | # |
| 753 | # Miscellaneous I2C Chip support | 951 | # Miscellaneous I2C Chip support |
| 754 | # | 952 | # |
| 755 | CONFIG_SENSORS_DS1337=y | 953 | # CONFIG_DS1682 is not set |
| 756 | CONFIG_SENSORS_DS1374=y | ||
| 757 | CONFIG_SENSORS_EEPROM=y | 954 | CONFIG_SENSORS_EEPROM=y |
| 758 | CONFIG_SENSORS_PCF8574=y | 955 | CONFIG_SENSORS_PCF8574=y |
| 759 | CONFIG_SENSORS_PCA9539=y | 956 | # CONFIG_PCF8575 is not set |
| 760 | CONFIG_SENSORS_PCF8591=y | 957 | CONFIG_SENSORS_PCF8591=y |
| 958 | # CONFIG_TPS65010 is not set | ||
| 761 | CONFIG_SENSORS_MAX6875=y | 959 | CONFIG_SENSORS_MAX6875=y |
| 960 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 762 | CONFIG_I2C_DEBUG_CORE=y | 961 | CONFIG_I2C_DEBUG_CORE=y |
| 763 | CONFIG_I2C_DEBUG_ALGO=y | 962 | CONFIG_I2C_DEBUG_ALGO=y |
| 764 | CONFIG_I2C_DEBUG_BUS=y | 963 | CONFIG_I2C_DEBUG_BUS=y |
| @@ -769,43 +968,49 @@ CONFIG_I2C_DEBUG_CHIP=y | |||
| 769 | # | 968 | # |
| 770 | # CONFIG_SPI is not set | 969 | # CONFIG_SPI is not set |
| 771 | # CONFIG_SPI_MASTER is not set | 970 | # CONFIG_SPI_MASTER is not set |
| 971 | # CONFIG_W1 is not set | ||
| 972 | # CONFIG_POWER_SUPPLY is not set | ||
| 973 | # CONFIG_HWMON is not set | ||
| 974 | # CONFIG_THERMAL is not set | ||
| 975 | # CONFIG_WATCHDOG is not set | ||
| 772 | 976 | ||
| 773 | # | 977 | # |
| 774 | # Dallas's 1-wire bus | 978 | # Sonics Silicon Backplane |
| 775 | # | 979 | # |
| 776 | # CONFIG_W1 is not set | 980 | CONFIG_SSB_POSSIBLE=y |
| 981 | # CONFIG_SSB is not set | ||
| 777 | 982 | ||
| 778 | # | 983 | # |
| 779 | # Hardware Monitoring support | 984 | # Multifunction device drivers |
| 780 | # | 985 | # |
| 781 | # CONFIG_HWMON is not set | 986 | # CONFIG_MFD_SM501 is not set |
| 782 | # CONFIG_HWMON_VID is not set | ||
| 783 | 987 | ||
| 784 | # | 988 | # |
| 785 | # Multimedia devices | 989 | # Multimedia devices |
| 786 | # | 990 | # |
| 787 | # CONFIG_VIDEO_DEV is not set | 991 | # CONFIG_VIDEO_DEV is not set |
| 788 | 992 | # CONFIG_DVB_CORE is not set | |
| 789 | # | 993 | # CONFIG_DAB is not set |
| 790 | # Digital Video Broadcasting Devices | ||
| 791 | # | ||
| 792 | # CONFIG_DVB is not set | ||
| 793 | 994 | ||
| 794 | # | 995 | # |
| 795 | # Graphics support | 996 | # Graphics support |
| 796 | # | 997 | # |
| 797 | # CONFIG_FIRMWARE_EDID is not set | 998 | # CONFIG_DRM is not set |
| 999 | # CONFIG_VGASTATE is not set | ||
| 1000 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 798 | # CONFIG_FB is not set | 1001 | # CONFIG_FB is not set |
| 799 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1002 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 800 | 1003 | ||
| 801 | # | 1004 | # |
| 802 | # Sound | 1005 | # Display device support |
| 803 | # | 1006 | # |
| 804 | # CONFIG_SOUND is not set | 1007 | # CONFIG_DISPLAY_SUPPORT is not set |
| 805 | 1008 | ||
| 806 | # | 1009 | # |
| 807 | # USB support | 1010 | # Sound |
| 808 | # | 1011 | # |
| 1012 | # CONFIG_SOUND is not set | ||
| 1013 | CONFIG_USB_SUPPORT=y | ||
| 809 | CONFIG_USB_ARCH_HAS_HCD=y | 1014 | CONFIG_USB_ARCH_HAS_HCD=y |
| 810 | CONFIG_USB_ARCH_HAS_OHCI=y | 1015 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 811 | CONFIG_USB_ARCH_HAS_EHCI=y | 1016 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -814,104 +1019,73 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 814 | # | 1019 | # |
| 815 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1020 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 816 | # | 1021 | # |
| 817 | |||
| 818 | # | ||
| 819 | # USB Gadget Support | ||
| 820 | # | ||
| 821 | # CONFIG_USB_GADGET is not set | 1022 | # CONFIG_USB_GADGET is not set |
| 822 | |||
| 823 | # | ||
| 824 | # MMC/SD Card support | ||
| 825 | # | ||
| 826 | # CONFIG_MMC is not set | 1023 | # CONFIG_MMC is not set |
| 827 | 1024 | # CONFIG_MEMSTICK is not set | |
| 828 | # | ||
| 829 | # LED devices | ||
| 830 | # | ||
| 831 | # CONFIG_NEW_LEDS is not set | 1025 | # CONFIG_NEW_LEDS is not set |
| 832 | |||
| 833 | # | ||
| 834 | # LED drivers | ||
| 835 | # | ||
| 836 | |||
| 837 | # | ||
| 838 | # LED Triggers | ||
| 839 | # | ||
| 840 | |||
| 841 | # | ||
| 842 | # InfiniBand support | ||
| 843 | # | ||
| 844 | # CONFIG_INFINIBAND is not set | 1026 | # CONFIG_INFINIBAND is not set |
| 845 | 1027 | CONFIG_RTC_LIB=y | |
| 846 | # | ||
| 847 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 848 | # | ||
| 849 | |||
| 850 | # | ||
| 851 | # Real Time Clock | ||
| 852 | # | ||
| 853 | # CONFIG_RTC_CLASS is not set | 1028 | # CONFIG_RTC_CLASS is not set |
| 854 | 1029 | ||
| 855 | # | 1030 | # |
| 856 | # DMA Engine support | 1031 | # Userspace I/O |
| 857 | # | ||
| 858 | # CONFIG_DMA_ENGINE is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # DMA Clients | ||
| 862 | # | ||
| 863 | |||
| 864 | # | ||
| 865 | # DMA Devices | ||
| 866 | # | ||
| 867 | |||
| 868 | # | ||
| 869 | # Auxiliary Display support | ||
| 870 | # | ||
| 871 | |||
| 872 | # | ||
| 873 | # Virtualization | ||
| 874 | # | 1032 | # |
| 1033 | # CONFIG_UIO is not set | ||
| 875 | 1034 | ||
| 876 | # | 1035 | # |
| 877 | # File systems | 1036 | # File systems |
| 878 | # | 1037 | # |
| 879 | CONFIG_EXT2_FS=y | 1038 | CONFIG_EXT2_FS=m |
| 880 | CONFIG_EXT2_FS_XATTR=y | 1039 | CONFIG_EXT2_FS_XATTR=y |
| 881 | CONFIG_EXT2_FS_POSIX_ACL=y | 1040 | # CONFIG_EXT2_FS_POSIX_ACL is not set |
| 882 | CONFIG_EXT2_FS_SECURITY=y | 1041 | # CONFIG_EXT2_FS_SECURITY is not set |
| 883 | # CONFIG_EXT2_FS_XIP is not set | 1042 | # CONFIG_EXT2_FS_XIP is not set |
| 884 | # CONFIG_EXT3_FS is not set | 1043 | CONFIG_EXT3_FS=y |
| 1044 | CONFIG_EXT3_FS_XATTR=y | ||
| 1045 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 1046 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 885 | # CONFIG_EXT4DEV_FS is not set | 1047 | # CONFIG_EXT4DEV_FS is not set |
| 1048 | CONFIG_JBD=y | ||
| 886 | CONFIG_FS_MBCACHE=y | 1049 | CONFIG_FS_MBCACHE=y |
| 887 | # CONFIG_REISERFS_FS is not set | 1050 | # CONFIG_REISERFS_FS is not set |
| 888 | # CONFIG_JFS_FS is not set | 1051 | # CONFIG_JFS_FS is not set |
| 889 | CONFIG_FS_POSIX_ACL=y | 1052 | # CONFIG_FS_POSIX_ACL is not set |
| 890 | # CONFIG_XFS_FS is not set | 1053 | # CONFIG_XFS_FS is not set |
| 891 | # CONFIG_GFS2_FS is not set | 1054 | # CONFIG_GFS2_FS is not set |
| 892 | # CONFIG_OCFS2_FS is not set | 1055 | # CONFIG_OCFS2_FS is not set |
| 893 | # CONFIG_MINIX_FS is not set | 1056 | CONFIG_DNOTIFY=y |
| 894 | # CONFIG_ROMFS_FS is not set | ||
| 895 | CONFIG_INOTIFY=y | 1057 | CONFIG_INOTIFY=y |
| 896 | CONFIG_INOTIFY_USER=y | 1058 | CONFIG_INOTIFY_USER=y |
| 897 | # CONFIG_QUOTA is not set | 1059 | CONFIG_QUOTA=y |
| 898 | CONFIG_DNOTIFY=y | 1060 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 899 | # CONFIG_AUTOFS_FS is not set | 1061 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 900 | # CONFIG_AUTOFS4_FS is not set | 1062 | # CONFIG_QFMT_V1 is not set |
| 901 | # CONFIG_FUSE_FS is not set | 1063 | CONFIG_QFMT_V2=m |
| 1064 | CONFIG_QUOTACTL=y | ||
| 1065 | CONFIG_AUTOFS_FS=m | ||
| 1066 | CONFIG_AUTOFS4_FS=m | ||
| 1067 | CONFIG_FUSE_FS=m | ||
| 902 | 1068 | ||
| 903 | # | 1069 | # |
| 904 | # CD-ROM/DVD Filesystems | 1070 | # CD-ROM/DVD Filesystems |
| 905 | # | 1071 | # |
| 906 | # CONFIG_ISO9660_FS is not set | 1072 | CONFIG_ISO9660_FS=m |
| 907 | # CONFIG_UDF_FS is not set | 1073 | CONFIG_JOLIET=y |
| 1074 | CONFIG_ZISOFS=y | ||
| 1075 | CONFIG_UDF_FS=m | ||
| 1076 | CONFIG_UDF_NLS=y | ||
| 908 | 1077 | ||
| 909 | # | 1078 | # |
| 910 | # DOS/FAT/NT Filesystems | 1079 | # DOS/FAT/NT Filesystems |
| 911 | # | 1080 | # |
| 912 | # CONFIG_MSDOS_FS is not set | 1081 | CONFIG_FAT_FS=m |
| 913 | # CONFIG_VFAT_FS is not set | 1082 | CONFIG_MSDOS_FS=m |
| 914 | # CONFIG_NTFS_FS is not set | 1083 | CONFIG_VFAT_FS=m |
| 1084 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1085 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1086 | CONFIG_NTFS_FS=m | ||
| 1087 | # CONFIG_NTFS_DEBUG is not set | ||
| 1088 | CONFIG_NTFS_RW=y | ||
| 915 | 1089 | ||
| 916 | # | 1090 | # |
| 917 | # Pseudo filesystems | 1091 | # Pseudo filesystems |
| @@ -923,7 +1097,6 @@ CONFIG_SYSFS=y | |||
| 923 | CONFIG_TMPFS=y | 1097 | CONFIG_TMPFS=y |
| 924 | # CONFIG_TMPFS_POSIX_ACL is not set | 1098 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 925 | # CONFIG_HUGETLB_PAGE is not set | 1099 | # CONFIG_HUGETLB_PAGE is not set |
| 926 | CONFIG_RAMFS=y | ||
| 927 | CONFIG_CONFIGFS_FS=m | 1100 | CONFIG_CONFIGFS_FS=m |
| 928 | 1101 | ||
| 929 | # | 1102 | # |
| @@ -939,14 +1112,13 @@ CONFIG_CONFIGFS_FS=m | |||
| 939 | # CONFIG_EFS_FS is not set | 1112 | # CONFIG_EFS_FS is not set |
| 940 | # CONFIG_CRAMFS is not set | 1113 | # CONFIG_CRAMFS is not set |
| 941 | # CONFIG_VXFS_FS is not set | 1114 | # CONFIG_VXFS_FS is not set |
| 1115 | # CONFIG_MINIX_FS is not set | ||
| 942 | # CONFIG_HPFS_FS is not set | 1116 | # CONFIG_HPFS_FS is not set |
| 943 | # CONFIG_QNX4FS_FS is not set | 1117 | # CONFIG_QNX4FS_FS is not set |
| 1118 | # CONFIG_ROMFS_FS is not set | ||
| 944 | # CONFIG_SYSV_FS is not set | 1119 | # CONFIG_SYSV_FS is not set |
| 945 | # CONFIG_UFS_FS is not set | 1120 | # CONFIG_UFS_FS is not set |
| 946 | 1121 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 947 | # | ||
| 948 | # Network File Systems | ||
| 949 | # | ||
| 950 | CONFIG_NFS_FS=y | 1122 | CONFIG_NFS_FS=y |
| 951 | CONFIG_NFS_V3=y | 1123 | CONFIG_NFS_V3=y |
| 952 | # CONFIG_NFS_V3_ACL is not set | 1124 | # CONFIG_NFS_V3_ACL is not set |
| @@ -958,6 +1130,7 @@ CONFIG_LOCKD=y | |||
| 958 | CONFIG_LOCKD_V4=y | 1130 | CONFIG_LOCKD_V4=y |
| 959 | CONFIG_NFS_COMMON=y | 1131 | CONFIG_NFS_COMMON=y |
| 960 | CONFIG_SUNRPC=y | 1132 | CONFIG_SUNRPC=y |
| 1133 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 961 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1134 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 962 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1135 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 963 | # CONFIG_SMB_FS is not set | 1136 | # CONFIG_SMB_FS is not set |
| @@ -965,37 +1138,61 @@ CONFIG_SUNRPC=y | |||
| 965 | # CONFIG_NCP_FS is not set | 1138 | # CONFIG_NCP_FS is not set |
| 966 | # CONFIG_CODA_FS is not set | 1139 | # CONFIG_CODA_FS is not set |
| 967 | # CONFIG_AFS_FS is not set | 1140 | # CONFIG_AFS_FS is not set |
| 968 | # CONFIG_9P_FS is not set | ||
| 969 | 1141 | ||
| 970 | # | 1142 | # |
| 971 | # Partition Types | 1143 | # Partition Types |
| 972 | # | 1144 | # |
| 973 | # CONFIG_PARTITION_ADVANCED is not set | 1145 | # CONFIG_PARTITION_ADVANCED is not set |
| 974 | CONFIG_MSDOS_PARTITION=y | 1146 | CONFIG_MSDOS_PARTITION=y |
| 975 | 1147 | CONFIG_NLS=m | |
| 976 | # | 1148 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 977 | # Native Language Support | 1149 | CONFIG_NLS_CODEPAGE_437=m |
| 978 | # | 1150 | CONFIG_NLS_CODEPAGE_737=m |
| 979 | # CONFIG_NLS is not set | 1151 | CONFIG_NLS_CODEPAGE_775=m |
| 980 | 1152 | CONFIG_NLS_CODEPAGE_850=m | |
| 981 | # | 1153 | CONFIG_NLS_CODEPAGE_852=m |
| 982 | # Distributed Lock Manager | 1154 | CONFIG_NLS_CODEPAGE_855=m |
| 983 | # | 1155 | CONFIG_NLS_CODEPAGE_857=m |
| 1156 | CONFIG_NLS_CODEPAGE_860=m | ||
| 1157 | CONFIG_NLS_CODEPAGE_861=m | ||
| 1158 | CONFIG_NLS_CODEPAGE_862=m | ||
| 1159 | CONFIG_NLS_CODEPAGE_863=m | ||
| 1160 | CONFIG_NLS_CODEPAGE_864=m | ||
| 1161 | CONFIG_NLS_CODEPAGE_865=m | ||
| 1162 | CONFIG_NLS_CODEPAGE_866=m | ||
| 1163 | CONFIG_NLS_CODEPAGE_869=m | ||
| 1164 | CONFIG_NLS_CODEPAGE_936=m | ||
| 1165 | CONFIG_NLS_CODEPAGE_950=m | ||
| 1166 | CONFIG_NLS_CODEPAGE_932=m | ||
| 1167 | CONFIG_NLS_CODEPAGE_949=m | ||
| 1168 | CONFIG_NLS_CODEPAGE_874=m | ||
| 1169 | CONFIG_NLS_ISO8859_8=m | ||
| 1170 | CONFIG_NLS_CODEPAGE_1250=m | ||
| 1171 | CONFIG_NLS_CODEPAGE_1251=m | ||
| 1172 | CONFIG_NLS_ASCII=m | ||
| 1173 | CONFIG_NLS_ISO8859_1=m | ||
| 1174 | CONFIG_NLS_ISO8859_2=m | ||
| 1175 | CONFIG_NLS_ISO8859_3=m | ||
| 1176 | CONFIG_NLS_ISO8859_4=m | ||
| 1177 | CONFIG_NLS_ISO8859_5=m | ||
| 1178 | CONFIG_NLS_ISO8859_6=m | ||
| 1179 | CONFIG_NLS_ISO8859_7=m | ||
| 1180 | CONFIG_NLS_ISO8859_9=m | ||
| 1181 | CONFIG_NLS_ISO8859_13=m | ||
| 1182 | CONFIG_NLS_ISO8859_14=m | ||
| 1183 | CONFIG_NLS_ISO8859_15=m | ||
| 1184 | CONFIG_NLS_KOI8_R=m | ||
| 1185 | CONFIG_NLS_KOI8_U=m | ||
| 1186 | CONFIG_NLS_UTF8=m | ||
| 984 | CONFIG_DLM=m | 1187 | CONFIG_DLM=m |
| 985 | CONFIG_DLM_TCP=y | ||
| 986 | # CONFIG_DLM_SCTP is not set | ||
| 987 | # CONFIG_DLM_DEBUG is not set | 1188 | # CONFIG_DLM_DEBUG is not set |
| 988 | 1189 | ||
| 989 | # | 1190 | # |
| 990 | # Profiling support | ||
| 991 | # | ||
| 992 | # CONFIG_PROFILING is not set | ||
| 993 | |||
| 994 | # | ||
| 995 | # Kernel hacking | 1191 | # Kernel hacking |
| 996 | # | 1192 | # |
| 997 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1193 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 998 | # CONFIG_PRINTK_TIME is not set | 1194 | # CONFIG_PRINTK_TIME is not set |
| 1195 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 999 | CONFIG_ENABLE_MUST_CHECK=y | 1196 | CONFIG_ENABLE_MUST_CHECK=y |
| 1000 | CONFIG_MAGIC_SYSRQ=y | 1197 | CONFIG_MAGIC_SYSRQ=y |
| 1001 | # CONFIG_UNUSED_SYMBOLS is not set | 1198 | # CONFIG_UNUSED_SYMBOLS is not set |
| @@ -1003,8 +1200,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1003 | # CONFIG_HEADERS_CHECK is not set | 1200 | # CONFIG_HEADERS_CHECK is not set |
| 1004 | CONFIG_DEBUG_KERNEL=y | 1201 | CONFIG_DEBUG_KERNEL=y |
| 1005 | # CONFIG_DEBUG_SHIRQ is not set | 1202 | # CONFIG_DEBUG_SHIRQ is not set |
| 1006 | CONFIG_LOG_BUF_SHIFT=16 | ||
| 1007 | CONFIG_DETECT_SOFTLOCKUP=y | 1203 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1204 | CONFIG_SCHED_DEBUG=y | ||
| 1008 | # CONFIG_SCHEDSTATS is not set | 1205 | # CONFIG_SCHEDSTATS is not set |
| 1009 | # CONFIG_TIMER_STATS is not set | 1206 | # CONFIG_TIMER_STATS is not set |
| 1010 | # CONFIG_DEBUG_SLAB is not set | 1207 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1014,15 +1211,19 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1014 | CONFIG_DEBUG_MUTEXES=y | 1211 | CONFIG_DEBUG_MUTEXES=y |
| 1015 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 1212 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
| 1016 | # CONFIG_PROVE_LOCKING is not set | 1213 | # CONFIG_PROVE_LOCKING is not set |
| 1214 | # CONFIG_LOCK_STAT is not set | ||
| 1017 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1215 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1018 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1216 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1019 | # CONFIG_DEBUG_KOBJECT is not set | 1217 | # CONFIG_DEBUG_KOBJECT is not set |
| 1020 | # CONFIG_DEBUG_INFO is not set | 1218 | # CONFIG_DEBUG_INFO is not set |
| 1021 | # CONFIG_DEBUG_VM is not set | 1219 | # CONFIG_DEBUG_VM is not set |
| 1022 | # CONFIG_DEBUG_LIST is not set | 1220 | # CONFIG_DEBUG_LIST is not set |
| 1023 | CONFIG_FORCED_INLINING=y | 1221 | # CONFIG_DEBUG_SG is not set |
| 1222 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1024 | # CONFIG_RCU_TORTURE_TEST is not set | 1223 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1025 | CONFIG_CROSSCOMPILE=y | 1224 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1225 | # CONFIG_FAULT_INJECTION is not set | ||
| 1226 | # CONFIG_SAMPLES is not set | ||
| 1026 | CONFIG_CMDLINE="" | 1227 | CONFIG_CMDLINE="" |
| 1027 | # CONFIG_DEBUG_STACK_USAGE is not set | 1228 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1028 | # CONFIG_SB1XXX_CORELIS is not set | 1229 | # CONFIG_SB1XXX_CORELIS is not set |
| @@ -1034,23 +1235,22 @@ CONFIG_CMDLINE="" | |||
| 1034 | CONFIG_KEYS=y | 1235 | CONFIG_KEYS=y |
| 1035 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1236 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1036 | # CONFIG_SECURITY is not set | 1237 | # CONFIG_SECURITY is not set |
| 1037 | 1238 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
| 1038 | # | ||
| 1039 | # Cryptographic options | ||
| 1040 | # | ||
| 1041 | CONFIG_CRYPTO=y | 1239 | CONFIG_CRYPTO=y |
| 1042 | CONFIG_CRYPTO_ALGAPI=y | 1240 | CONFIG_CRYPTO_ALGAPI=y |
| 1043 | CONFIG_CRYPTO_BLKCIPHER=m | 1241 | CONFIG_CRYPTO_AEAD=m |
| 1242 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1243 | CONFIG_CRYPTO_SEQIV=m | ||
| 1044 | CONFIG_CRYPTO_HASH=y | 1244 | CONFIG_CRYPTO_HASH=y |
| 1045 | CONFIG_CRYPTO_MANAGER=y | 1245 | CONFIG_CRYPTO_MANAGER=y |
| 1046 | CONFIG_CRYPTO_HMAC=y | 1246 | CONFIG_CRYPTO_HMAC=y |
| 1047 | CONFIG_CRYPTO_XCBC=m | 1247 | CONFIG_CRYPTO_XCBC=m |
| 1048 | CONFIG_CRYPTO_NULL=y | 1248 | CONFIG_CRYPTO_NULL=y |
| 1049 | CONFIG_CRYPTO_MD4=y | 1249 | CONFIG_CRYPTO_MD4=m |
| 1050 | CONFIG_CRYPTO_MD5=y | 1250 | CONFIG_CRYPTO_MD5=y |
| 1051 | CONFIG_CRYPTO_SHA1=y | 1251 | CONFIG_CRYPTO_SHA1=m |
| 1052 | CONFIG_CRYPTO_SHA256=y | 1252 | CONFIG_CRYPTO_SHA256=m |
| 1053 | CONFIG_CRYPTO_SHA512=y | 1253 | CONFIG_CRYPTO_SHA512=m |
| 1054 | CONFIG_CRYPTO_WP512=m | 1254 | CONFIG_CRYPTO_WP512=m |
| 1055 | CONFIG_CRYPTO_TGR192=m | 1255 | CONFIG_CRYPTO_TGR192=m |
| 1056 | CONFIG_CRYPTO_GF128MUL=m | 1256 | CONFIG_CRYPTO_GF128MUL=m |
| @@ -1058,39 +1258,50 @@ CONFIG_CRYPTO_ECB=m | |||
| 1058 | CONFIG_CRYPTO_CBC=m | 1258 | CONFIG_CRYPTO_CBC=m |
| 1059 | CONFIG_CRYPTO_PCBC=m | 1259 | CONFIG_CRYPTO_PCBC=m |
| 1060 | CONFIG_CRYPTO_LRW=m | 1260 | CONFIG_CRYPTO_LRW=m |
| 1061 | CONFIG_CRYPTO_DES=y | 1261 | CONFIG_CRYPTO_XTS=m |
| 1262 | CONFIG_CRYPTO_CTR=m | ||
| 1263 | CONFIG_CRYPTO_GCM=m | ||
| 1264 | CONFIG_CRYPTO_CCM=m | ||
| 1265 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1266 | CONFIG_CRYPTO_DES=m | ||
| 1062 | CONFIG_CRYPTO_FCRYPT=m | 1267 | CONFIG_CRYPTO_FCRYPT=m |
| 1063 | CONFIG_CRYPTO_BLOWFISH=y | 1268 | CONFIG_CRYPTO_BLOWFISH=m |
| 1064 | CONFIG_CRYPTO_TWOFISH=y | 1269 | CONFIG_CRYPTO_TWOFISH=m |
| 1065 | CONFIG_CRYPTO_TWOFISH_COMMON=y | 1270 | CONFIG_CRYPTO_TWOFISH_COMMON=m |
| 1066 | CONFIG_CRYPTO_SERPENT=y | 1271 | CONFIG_CRYPTO_SERPENT=m |
| 1067 | CONFIG_CRYPTO_AES=m | 1272 | CONFIG_CRYPTO_AES=m |
| 1068 | # CONFIG_CRYPTO_CAST5 is not set | 1273 | CONFIG_CRYPTO_CAST5=m |
| 1069 | # CONFIG_CRYPTO_CAST6 is not set | 1274 | CONFIG_CRYPTO_CAST6=m |
| 1070 | CONFIG_CRYPTO_TEA=m | 1275 | CONFIG_CRYPTO_TEA=m |
| 1071 | # CONFIG_CRYPTO_ARC4 is not set | 1276 | CONFIG_CRYPTO_ARC4=m |
| 1072 | CONFIG_CRYPTO_KHAZAD=m | 1277 | CONFIG_CRYPTO_KHAZAD=m |
| 1073 | CONFIG_CRYPTO_ANUBIS=m | 1278 | CONFIG_CRYPTO_ANUBIS=m |
| 1074 | CONFIG_CRYPTO_DEFLATE=y | 1279 | CONFIG_CRYPTO_SEED=m |
| 1075 | CONFIG_CRYPTO_MICHAEL_MIC=y | 1280 | CONFIG_CRYPTO_SALSA20=m |
| 1281 | CONFIG_CRYPTO_DEFLATE=m | ||
| 1282 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1076 | # CONFIG_CRYPTO_CRC32C is not set | 1283 | # CONFIG_CRYPTO_CRC32C is not set |
| 1077 | CONFIG_CRYPTO_CAMELLIA=m | 1284 | CONFIG_CRYPTO_CAMELLIA=m |
| 1078 | # CONFIG_CRYPTO_TEST is not set | 1285 | # CONFIG_CRYPTO_TEST is not set |
| 1079 | 1286 | CONFIG_CRYPTO_AUTHENC=m | |
| 1080 | # | 1287 | # CONFIG_CRYPTO_LZO is not set |
| 1081 | # Hardware crypto devices | 1288 | CONFIG_CRYPTO_HW=y |
| 1082 | # | 1289 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1083 | 1290 | ||
| 1084 | # | 1291 | # |
| 1085 | # Library routines | 1292 | # Library routines |
| 1086 | # | 1293 | # |
| 1087 | CONFIG_BITREVERSE=y | 1294 | CONFIG_BITREVERSE=y |
| 1088 | # CONFIG_CRC_CCITT is not set | 1295 | CONFIG_CRC_CCITT=m |
| 1089 | # CONFIG_CRC16 is not set | 1296 | # CONFIG_CRC16 is not set |
| 1297 | # CONFIG_CRC_ITU_T is not set | ||
| 1090 | CONFIG_CRC32=y | 1298 | CONFIG_CRC32=y |
| 1091 | # CONFIG_LIBCRC32C is not set | 1299 | # CONFIG_CRC7 is not set |
| 1092 | CONFIG_ZLIB_INFLATE=y | 1300 | CONFIG_LIBCRC32C=m |
| 1093 | CONFIG_ZLIB_DEFLATE=y | 1301 | CONFIG_AUDIT_GENERIC=y |
| 1302 | CONFIG_ZLIB_INFLATE=m | ||
| 1303 | CONFIG_ZLIB_DEFLATE=m | ||
| 1094 | CONFIG_PLIST=y | 1304 | CONFIG_PLIST=y |
| 1095 | CONFIG_HAS_IOMEM=y | 1305 | CONFIG_HAS_IOMEM=y |
| 1096 | CONFIG_HAS_IOPORT=y | 1306 | CONFIG_HAS_IOPORT=y |
| 1307 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c index fc4aa07b6d35..38fa1a194bf4 100644 --- a/arch/mips/kernel/i8253.c +++ b/arch/mips/kernel/i8253.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <asm/time.h> | 15 | #include <asm/time.h> |
| 16 | 16 | ||
| 17 | DEFINE_SPINLOCK(i8253_lock); | 17 | DEFINE_SPINLOCK(i8253_lock); |
| 18 | EXPORT_SYMBOL(i8253_lock); | ||
| 18 | 19 | ||
| 19 | /* | 20 | /* |
| 20 | * Initialize the PIT timer. | 21 | * Initialize the PIT timer. |
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 9f85d4cecc5b..b45a7093ca2d 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
| @@ -157,6 +157,6 @@ void __init time_init(void) | |||
| 157 | { | 157 | { |
| 158 | plat_time_init(); | 158 | plat_time_init(); |
| 159 | 159 | ||
| 160 | if (mips_clockevent_init() || !cpu_has_mfc0_count_bug()) | 160 | if (!mips_clockevent_init() || !cpu_has_mfc0_count_bug()) |
| 161 | init_mips_clocksource(); | 161 | init_mips_clocksource(); |
| 162 | } | 162 | } |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index eed2dc4273e0..39804c584edd 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
| @@ -262,13 +262,21 @@ void dump_mtregs(void) | |||
| 262 | /* Find some VPE program space */ | 262 | /* Find some VPE program space */ |
| 263 | static void *alloc_progmem(unsigned long len) | 263 | static void *alloc_progmem(unsigned long len) |
| 264 | { | 264 | { |
| 265 | void *addr; | ||
| 266 | |||
| 265 | #ifdef CONFIG_MIPS_VPE_LOADER_TOM | 267 | #ifdef CONFIG_MIPS_VPE_LOADER_TOM |
| 266 | /* this means you must tell linux to use less memory than you physically have */ | 268 | /* |
| 267 | return pfn_to_kaddr(max_pfn); | 269 | * This means you must tell Linux to use less memory than you |
| 270 | * physically have, for example by passing a mem= boot argument. | ||
| 271 | */ | ||
| 272 | addr = pfn_to_kaddr(max_pfn); | ||
| 273 | memset(addr, 0, len); | ||
| 268 | #else | 274 | #else |
| 269 | // simple grab some mem for now | 275 | /* simple grab some mem for now */ |
| 270 | return kmalloc(len, GFP_KERNEL); | 276 | addr = kzalloc(len, GFP_KERNEL); |
| 271 | #endif | 277 | #endif |
| 278 | |||
| 279 | return addr; | ||
| 272 | } | 280 | } |
| 273 | 281 | ||
| 274 | static void release_progmem(void *ptr) | 282 | static void release_progmem(void *ptr) |
| @@ -884,9 +892,10 @@ static int vpe_elfload(struct vpe * v) | |||
| 884 | } | 892 | } |
| 885 | 893 | ||
| 886 | v->load_addr = alloc_progmem(mod.core_size); | 894 | v->load_addr = alloc_progmem(mod.core_size); |
| 887 | memset(v->load_addr, 0, mod.core_size); | 895 | if (!v->load_addr) |
| 896 | return -ENOMEM; | ||
| 888 | 897 | ||
| 889 | printk("VPE loader: loading to %p\n", v->load_addr); | 898 | pr_info("VPE loader: loading to %p\n", v->load_addr); |
| 890 | 899 | ||
| 891 | if (relocate) { | 900 | if (relocate) { |
| 892 | for (i = 0; i < hdr->e_shnum; i++) { | 901 | for (i = 0; i < hdr->e_shnum; i++) { |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 3a93d4ce2703..382738ca8a0b 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
| @@ -307,6 +307,7 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l, | |||
| 307 | case CPU_R12000: | 307 | case CPU_R12000: |
| 308 | case CPU_R14000: | 308 | case CPU_R14000: |
| 309 | case CPU_4KC: | 309 | case CPU_4KC: |
| 310 | case CPU_4KEC: | ||
| 310 | case CPU_SB1: | 311 | case CPU_SB1: |
| 311 | case CPU_SB1A: | 312 | case CPU_SB1A: |
| 312 | case CPU_4KSC: | 313 | case CPU_4KSC: |
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index ab68c4318a30..87e2c8f54e2d 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c | |||
| @@ -185,8 +185,8 @@ static struct resource bcm1480_mem_resource = { | |||
| 185 | 185 | ||
| 186 | static struct resource bcm1480_io_resource = { | 186 | static struct resource bcm1480_io_resource = { |
| 187 | .name = "BCM1480 PCI I/O", | 187 | .name = "BCM1480 PCI I/O", |
| 188 | .start = 0x2c000000UL, | 188 | .start = A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, |
| 189 | .end = 0x2dffffffUL, | 189 | .end = A_BCM1480_PHYS_PCI_IO_MATCH_BYTES + 0x1ffffffUL, |
| 190 | .flags = IORESOURCE_IO, | 190 | .flags = IORESOURCE_IO, |
| 191 | }; | 191 | }; |
| 192 | 192 | ||
| @@ -194,6 +194,7 @@ struct pci_controller bcm1480_controller = { | |||
| 194 | .pci_ops = &bcm1480_pci_ops, | 194 | .pci_ops = &bcm1480_pci_ops, |
| 195 | .mem_resource = &bcm1480_mem_resource, | 195 | .mem_resource = &bcm1480_mem_resource, |
| 196 | .io_resource = &bcm1480_io_resource, | 196 | .io_resource = &bcm1480_io_resource, |
| 197 | .io_offset = A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, | ||
| 197 | }; | 198 | }; |
| 198 | 199 | ||
| 199 | 200 | ||
| @@ -251,6 +252,7 @@ static int __init bcm1480_pcibios_init(void) | |||
| 251 | 252 | ||
| 252 | bcm1480_controller.io_map_base = (unsigned long) | 253 | bcm1480_controller.io_map_base = (unsigned long) |
| 253 | ioremap(A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, 65536); | 254 | ioremap(A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, 65536); |
| 255 | bcm1480_controller.io_map_base -= bcm1480_controller.io_offset; | ||
| 254 | set_io_port_base(bcm1480_controller.io_map_base); | 256 | set_io_port_base(bcm1480_controller.io_map_base); |
| 255 | isa_slot_offset = (unsigned long) | 257 | isa_slot_offset = (unsigned long) |
| 256 | ioremap(A_BCM1480_PHYS_PCI_MEM_MATCH_BYTES, 1024*1024); | 258 | ioremap(A_BCM1480_PHYS_PCI_MEM_MATCH_BYTES, 1024*1024); |
diff --git a/arch/mips/pci/pci-bcm1480ht.c b/arch/mips/pci/pci-bcm1480ht.c index 005e7fecab08..f54f45412b0b 100644 --- a/arch/mips/pci/pci-bcm1480ht.c +++ b/arch/mips/pci/pci-bcm1480ht.c | |||
| @@ -180,8 +180,8 @@ static struct resource bcm1480ht_mem_resource = { | |||
| 180 | 180 | ||
| 181 | static struct resource bcm1480ht_io_resource = { | 181 | static struct resource bcm1480ht_io_resource = { |
| 182 | .name = "BCM1480 HT I/O", | 182 | .name = "BCM1480 HT I/O", |
| 183 | .start = 0x00000000UL, | 183 | .start = A_BCM1480_PHYS_HT_IO_MATCH_BYTES, |
| 184 | .end = 0x01ffffffUL, | 184 | .end = A_BCM1480_PHYS_HT_IO_MATCH_BYTES + 0x01ffffffUL, |
| 185 | .flags = IORESOURCE_IO, | 185 | .flags = IORESOURCE_IO, |
| 186 | }; | 186 | }; |
| 187 | 187 | ||
| @@ -191,29 +191,22 @@ struct pci_controller bcm1480ht_controller = { | |||
| 191 | .io_resource = &bcm1480ht_io_resource, | 191 | .io_resource = &bcm1480ht_io_resource, |
| 192 | .index = 1, | 192 | .index = 1, |
| 193 | .get_busno = bcm1480ht_pcibios_get_busno, | 193 | .get_busno = bcm1480ht_pcibios_get_busno, |
| 194 | .io_offset = A_BCM1480_PHYS_HT_IO_MATCH_BYTES, | ||
| 194 | }; | 195 | }; |
| 195 | 196 | ||
| 196 | static int __init bcm1480ht_pcibios_init(void) | 197 | static int __init bcm1480ht_pcibios_init(void) |
| 197 | { | 198 | { |
| 198 | uint32_t cmdreg; | ||
| 199 | |||
| 200 | ht_cfg_space = ioremap(A_BCM1480_PHYS_HT_CFG_MATCH_BITS, 16*1024*1024); | 199 | ht_cfg_space = ioremap(A_BCM1480_PHYS_HT_CFG_MATCH_BITS, 16*1024*1024); |
| 201 | 200 | ||
| 202 | /* | 201 | /* CFE doesn't always init all HT paths, so we always scan */ |
| 203 | * See if the PCI bus has been configured by the firmware. | ||
| 204 | */ | ||
| 205 | cmdreg = READCFG32(CFGOFFSET(0, PCI_DEVFN(PCI_BRIDGE_DEVICE, 0), | ||
| 206 | PCI_COMMAND)); | ||
| 207 | if (!(cmdreg & PCI_COMMAND_MASTER)) { | ||
| 208 | printk("HT: Skipping HT probe. Bus is not initialized.\n"); | ||
| 209 | iounmap(ht_cfg_space); | ||
| 210 | return 1; /* XXX */ | ||
| 211 | } | ||
| 212 | bcm1480ht_bus_status |= PCI_BUS_ENABLED; | 202 | bcm1480ht_bus_status |= PCI_BUS_ENABLED; |
| 213 | 203 | ||
| 214 | ht_eoi_space = (unsigned long) | 204 | ht_eoi_space = (unsigned long) |
| 215 | ioremap(A_BCM1480_PHYS_HT_SPECIAL_MATCH_BYTES, | 205 | ioremap(A_BCM1480_PHYS_HT_SPECIAL_MATCH_BYTES, |
| 216 | 4 * 1024 * 1024); | 206 | 4 * 1024 * 1024); |
| 207 | bcm1480ht_controller.io_map_base = (unsigned long) | ||
| 208 | ioremap(A_BCM1480_PHYS_HT_IO_MATCH_BYTES, 65536); | ||
| 209 | bcm1480ht_controller.io_map_base -= bcm1480ht_controller.io_offset; | ||
| 217 | 210 | ||
| 218 | register_pci_controller(&bcm1480ht_controller); | 211 | register_pci_controller(&bcm1480ht_controller); |
| 219 | 212 | ||
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 797f0dfebde2..09f306248f2e 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.24-rc6 | 3 | # Linux kernel version: 2.6.25-rc6 |
| 4 | # Tue Jan 15 10:26:10 2008 | 4 | # Tue Mar 25 10:25:48 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -27,6 +27,7 @@ CONFIG_GENERIC_TIME=y | |||
| 27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 27 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 28 | CONFIG_GENERIC_CLOCKEVENTS=y | 28 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
| 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
| 30 | CONFIG_IRQ_PER_CPU=y | 31 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 32 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 33 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -67,17 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 67 | # CONFIG_POSIX_MQUEUE is not set | 68 | # CONFIG_POSIX_MQUEUE is not set |
| 68 | # CONFIG_BSD_PROCESS_ACCT is not set | 69 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 69 | # CONFIG_TASKSTATS is not set | 70 | # CONFIG_TASKSTATS is not set |
| 70 | # CONFIG_USER_NS is not set | ||
| 71 | # CONFIG_PID_NS is not set | ||
| 72 | # CONFIG_AUDIT is not set | 71 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 72 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=17 | 73 | CONFIG_LOG_BUF_SHIFT=17 |
| 75 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 76 | CONFIG_FAIR_GROUP_SCHED=y | 75 | # CONFIG_GROUP_SCHED is not set |
| 77 | CONFIG_FAIR_USER_SCHED=y | ||
| 78 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 79 | CONFIG_SYSFS_DEPRECATED=y | 76 | CONFIG_SYSFS_DEPRECATED=y |
| 77 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 80 | # CONFIG_RELAY is not set | 78 | # CONFIG_RELAY is not set |
| 79 | CONFIG_NAMESPACES=y | ||
| 80 | # CONFIG_UTS_NS is not set | ||
| 81 | # CONFIG_IPC_NS is not set | ||
| 82 | # CONFIG_USER_NS is not set | ||
| 83 | # CONFIG_PID_NS is not set | ||
| 81 | CONFIG_BLK_DEV_INITRD=y | 84 | CONFIG_BLK_DEV_INITRD=y |
| 82 | CONFIG_INITRAMFS_SOURCE="" | 85 | CONFIG_INITRAMFS_SOURCE="" |
| 83 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 86 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| @@ -91,11 +94,13 @@ CONFIG_HOTPLUG=y | |||
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| 92 | CONFIG_BUG=y | 95 | CONFIG_BUG=y |
| 93 | CONFIG_ELF_CORE=y | 96 | CONFIG_ELF_CORE=y |
| 97 | CONFIG_COMPAT_BRK=y | ||
| 94 | CONFIG_BASE_FULL=y | 98 | CONFIG_BASE_FULL=y |
| 95 | CONFIG_FUTEX=y | 99 | CONFIG_FUTEX=y |
| 96 | CONFIG_ANON_INODES=y | 100 | CONFIG_ANON_INODES=y |
| 97 | CONFIG_EPOLL=y | 101 | CONFIG_EPOLL=y |
| 98 | CONFIG_SIGNALFD=y | 102 | CONFIG_SIGNALFD=y |
| 103 | CONFIG_TIMERFD=y | ||
| 99 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 100 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 101 | CONFIG_VM_EVENT_COUNTERS=y | 106 | CONFIG_VM_EVENT_COUNTERS=y |
| @@ -103,6 +108,15 @@ CONFIG_SLUB_DEBUG=y | |||
| 103 | # CONFIG_SLAB is not set | 108 | # CONFIG_SLAB is not set |
| 104 | CONFIG_SLUB=y | 109 | CONFIG_SLUB=y |
| 105 | # CONFIG_SLOB is not set | 110 | # CONFIG_SLOB is not set |
| 111 | CONFIG_PROFILING=y | ||
| 112 | # CONFIG_MARKERS is not set | ||
| 113 | CONFIG_OPROFILE=y | ||
| 114 | CONFIG_HAVE_OPROFILE=y | ||
| 115 | # CONFIG_KPROBES is not set | ||
| 116 | CONFIG_HAVE_KPROBES=y | ||
| 117 | CONFIG_HAVE_KRETPROBES=y | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 119 | CONFIG_SLABINFO=y | ||
| 106 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 107 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 108 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| @@ -130,6 +144,7 @@ CONFIG_DEFAULT_AS=y | |||
| 130 | # CONFIG_DEFAULT_CFQ is not set | 144 | # CONFIG_DEFAULT_CFQ is not set |
| 131 | # CONFIG_DEFAULT_NOOP is not set | 145 | # CONFIG_DEFAULT_NOOP is not set |
| 132 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 146 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 147 | CONFIG_CLASSIC_RCU=y | ||
| 133 | 148 | ||
| 134 | # | 149 | # |
| 135 | # Platform support | 150 | # Platform support |
| @@ -140,8 +155,8 @@ CONFIG_PPC_MULTIPLATFORM=y | |||
| 140 | # CONFIG_PPC_86xx is not set | 155 | # CONFIG_PPC_86xx is not set |
| 141 | # CONFIG_PPC_PSERIES is not set | 156 | # CONFIG_PPC_PSERIES is not set |
| 142 | # CONFIG_PPC_ISERIES is not set | 157 | # CONFIG_PPC_ISERIES is not set |
| 143 | # CONFIG_PPC_MPC52xx is not set | 158 | # CONFIG_PPC_MPC512x is not set |
| 144 | # CONFIG_PPC_MPC5200 is not set | 159 | # CONFIG_PPC_MPC5121 is not set |
| 145 | # CONFIG_PPC_PMAC is not set | 160 | # CONFIG_PPC_PMAC is not set |
| 146 | # CONFIG_PPC_MAPLE is not set | 161 | # CONFIG_PPC_MAPLE is not set |
| 147 | CONFIG_PPC_PASEMI=y | 162 | CONFIG_PPC_PASEMI=y |
| @@ -159,6 +174,7 @@ CONFIG_PPC_PASEMI_MDIO=y | |||
| 159 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 174 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 160 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_PPC_NATIVE=y | 176 | CONFIG_PPC_NATIVE=y |
| 177 | # CONFIG_IPIC is not set | ||
| 162 | CONFIG_MPIC=y | 178 | CONFIG_MPIC=y |
| 163 | # CONFIG_MPIC_WEIRD is not set | 179 | # CONFIG_MPIC_WEIRD is not set |
| 164 | # CONFIG_PPC_I8259 is not set | 180 | # CONFIG_PPC_I8259 is not set |
| @@ -189,7 +205,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y | |||
| 189 | # CPU Frequency drivers | 205 | # CPU Frequency drivers |
| 190 | # | 206 | # |
| 191 | CONFIG_PPC_PASEMI_CPUFREQ=y | 207 | CONFIG_PPC_PASEMI_CPUFREQ=y |
| 192 | # CONFIG_CPM2 is not set | ||
| 193 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
| 194 | 209 | ||
| 195 | # | 210 | # |
| @@ -204,16 +219,20 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
| 204 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
| 205 | CONFIG_HZ_1000=y | 220 | CONFIG_HZ_1000=y |
| 206 | CONFIG_HZ=1000 | 221 | CONFIG_HZ=1000 |
| 222 | # CONFIG_SCHED_HRTICK is not set | ||
| 207 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
| 208 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 209 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
| 210 | # CONFIG_PREEMPT_BKL is not set | ||
| 211 | CONFIG_BINFMT_ELF=y | 226 | CONFIG_BINFMT_ELF=y |
| 227 | CONFIG_COMPAT_BINFMT_ELF=y | ||
| 212 | # CONFIG_BINFMT_MISC is not set | 228 | # CONFIG_BINFMT_MISC is not set |
| 213 | CONFIG_FORCE_MAX_ZONEORDER=9 | 229 | CONFIG_FORCE_MAX_ZONEORDER=9 |
| 214 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 230 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 215 | CONFIG_IOMMU_VMERGE=y | 231 | CONFIG_IOMMU_VMERGE=y |
| 232 | CONFIG_IOMMU_HELPER=y | ||
| 216 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 233 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 234 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 235 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 217 | # CONFIG_KEXEC is not set | 236 | # CONFIG_KEXEC is not set |
| 218 | # CONFIG_CRASH_DUMP is not set | 237 | # CONFIG_CRASH_DUMP is not set |
| 219 | # CONFIG_IRQ_ALL_CPUS is not set | 238 | # CONFIG_IRQ_ALL_CPUS is not set |
| @@ -236,12 +255,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 236 | CONFIG_BOUNCE=y | 255 | CONFIG_BOUNCE=y |
| 237 | CONFIG_PPC_HAS_HASH_64K=y | 256 | CONFIG_PPC_HAS_HASH_64K=y |
| 238 | CONFIG_PPC_64K_PAGES=y | 257 | CONFIG_PPC_64K_PAGES=y |
| 258 | # CONFIG_PPC_SUBPAGE_PROT is not set | ||
| 239 | # CONFIG_SCHED_SMT is not set | 259 | # CONFIG_SCHED_SMT is not set |
| 240 | CONFIG_PROC_DEVICETREE=y | 260 | CONFIG_PROC_DEVICETREE=y |
| 241 | # CONFIG_CMDLINE_BOOL is not set | 261 | # CONFIG_CMDLINE_BOOL is not set |
| 242 | # CONFIG_PM is not set | 262 | # CONFIG_PM is not set |
| 243 | # CONFIG_SECCOMP is not set | 263 | # CONFIG_SECCOMP is not set |
| 244 | # CONFIG_WANT_DEVICE_TREE is not set | ||
| 245 | CONFIG_ISA_DMA_API=y | 264 | CONFIG_ISA_DMA_API=y |
| 246 | 265 | ||
| 247 | # | 266 | # |
| @@ -290,6 +309,7 @@ CONFIG_XFRM=y | |||
| 290 | CONFIG_XFRM_USER=y | 309 | CONFIG_XFRM_USER=y |
| 291 | # CONFIG_XFRM_SUB_POLICY is not set | 310 | # CONFIG_XFRM_SUB_POLICY is not set |
| 292 | # CONFIG_XFRM_MIGRATE is not set | 311 | # CONFIG_XFRM_MIGRATE is not set |
| 312 | # CONFIG_XFRM_STATISTICS is not set | ||
| 293 | CONFIG_NET_KEY=y | 313 | CONFIG_NET_KEY=y |
| 294 | # CONFIG_NET_KEY_MIGRATE is not set | 314 | # CONFIG_NET_KEY_MIGRATE is not set |
| 295 | CONFIG_INET=y | 315 | CONFIG_INET=y |
| @@ -346,6 +366,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 346 | # | 366 | # |
| 347 | # CONFIG_NET_PKTGEN is not set | 367 | # CONFIG_NET_PKTGEN is not set |
| 348 | # CONFIG_HAMRADIO is not set | 368 | # CONFIG_HAMRADIO is not set |
| 369 | # CONFIG_CAN is not set | ||
| 349 | # CONFIG_IRDA is not set | 370 | # CONFIG_IRDA is not set |
| 350 | # CONFIG_BT is not set | 371 | # CONFIG_BT is not set |
| 351 | # CONFIG_AF_RXRPC is not set | 372 | # CONFIG_AF_RXRPC is not set |
| @@ -441,8 +462,10 @@ CONFIG_MTD_NAND=y | |||
| 441 | CONFIG_MTD_NAND_IDS=y | 462 | CONFIG_MTD_NAND_IDS=y |
| 442 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 463 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 443 | # CONFIG_MTD_NAND_CAFE is not set | 464 | # CONFIG_MTD_NAND_CAFE is not set |
| 465 | CONFIG_MTD_NAND_PASEMI=y | ||
| 444 | # CONFIG_MTD_NAND_PLATFORM is not set | 466 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 445 | # CONFIG_MTD_ALAUDA is not set | 467 | # CONFIG_MTD_ALAUDA is not set |
| 468 | # CONFIG_MTD_NAND_FSL_ELBC is not set | ||
| 446 | # CONFIG_MTD_ONENAND is not set | 469 | # CONFIG_MTD_ONENAND is not set |
| 447 | 470 | ||
| 448 | # | 471 | # |
| @@ -465,7 +488,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 465 | CONFIG_BLK_DEV_RAM=y | 488 | CONFIG_BLK_DEV_RAM=y |
| 466 | CONFIG_BLK_DEV_RAM_COUNT=16 | 489 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 467 | CONFIG_BLK_DEV_RAM_SIZE=16384 | 490 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
| 468 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 491 | # CONFIG_BLK_DEV_XIP is not set |
| 469 | # CONFIG_CDROM_PKTCDVD is not set | 492 | # CONFIG_CDROM_PKTCDVD is not set |
| 470 | # CONFIG_ATA_OVER_ETH is not set | 493 | # CONFIG_ATA_OVER_ETH is not set |
| 471 | CONFIG_MISC_DEVICES=y | 494 | CONFIG_MISC_DEVICES=y |
| @@ -473,11 +496,13 @@ CONFIG_MISC_DEVICES=y | |||
| 473 | # CONFIG_EEPROM_93CX6 is not set | 496 | # CONFIG_EEPROM_93CX6 is not set |
| 474 | # CONFIG_SGI_IOC4 is not set | 497 | # CONFIG_SGI_IOC4 is not set |
| 475 | # CONFIG_TIFM_CORE is not set | 498 | # CONFIG_TIFM_CORE is not set |
| 499 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 500 | CONFIG_HAVE_IDE=y | ||
| 476 | CONFIG_IDE=y | 501 | CONFIG_IDE=y |
| 477 | CONFIG_BLK_DEV_IDE=y | 502 | CONFIG_BLK_DEV_IDE=y |
| 478 | 503 | ||
| 479 | # | 504 | # |
| 480 | # Please see Documentation/ide.txt for help/info on IDE drives | 505 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 481 | # | 506 | # |
| 482 | # CONFIG_BLK_DEV_IDE_SATA is not set | 507 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 483 | CONFIG_BLK_DEV_IDEDISK=y | 508 | CONFIG_BLK_DEV_IDEDISK=y |
| @@ -485,6 +510,7 @@ CONFIG_IDEDISK_MULTI_MODE=y | |||
| 485 | # CONFIG_BLK_DEV_IDECS is not set | 510 | # CONFIG_BLK_DEV_IDECS is not set |
| 486 | # CONFIG_BLK_DEV_DELKIN is not set | 511 | # CONFIG_BLK_DEV_DELKIN is not set |
| 487 | CONFIG_BLK_DEV_IDECD=y | 512 | CONFIG_BLK_DEV_IDECD=y |
| 513 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 488 | # CONFIG_BLK_DEV_IDETAPE is not set | 514 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 489 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 515 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 490 | CONFIG_BLK_DEV_IDESCSI=y | 516 | CONFIG_BLK_DEV_IDESCSI=y |
| @@ -500,7 +526,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 500 | # | 526 | # |
| 501 | # PCI IDE chipsets support | 527 | # PCI IDE chipsets support |
| 502 | # | 528 | # |
| 503 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 504 | # CONFIG_BLK_DEV_GENERIC is not set | 529 | # CONFIG_BLK_DEV_GENERIC is not set |
| 505 | # CONFIG_BLK_DEV_OPTI621 is not set | 530 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 506 | # CONFIG_BLK_DEV_AEC62XX is not set | 531 | # CONFIG_BLK_DEV_AEC62XX is not set |
| @@ -528,7 +553,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 528 | # CONFIG_BLK_DEV_TRM290 is not set | 553 | # CONFIG_BLK_DEV_TRM290 is not set |
| 529 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 554 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 530 | # CONFIG_BLK_DEV_TC86C001 is not set | 555 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 531 | # CONFIG_IDE_ARM is not set | ||
| 532 | # CONFIG_BLK_DEV_IDEDMA is not set | 556 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 533 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 557 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y |
| 534 | # CONFIG_BLK_DEV_HD is not set | 558 | # CONFIG_BLK_DEV_HD is not set |
| @@ -593,6 +617,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 593 | # CONFIG_SCSI_IPS is not set | 617 | # CONFIG_SCSI_IPS is not set |
| 594 | # CONFIG_SCSI_INITIO is not set | 618 | # CONFIG_SCSI_INITIO is not set |
| 595 | # CONFIG_SCSI_INIA100 is not set | 619 | # CONFIG_SCSI_INIA100 is not set |
| 620 | # CONFIG_SCSI_MVSAS is not set | ||
| 596 | # CONFIG_SCSI_STEX is not set | 621 | # CONFIG_SCSI_STEX is not set |
| 597 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 622 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 598 | # CONFIG_SCSI_IPR is not set | 623 | # CONFIG_SCSI_IPR is not set |
| @@ -646,6 +671,7 @@ CONFIG_ATA_GENERIC=y | |||
| 646 | # CONFIG_PATA_MPIIX is not set | 671 | # CONFIG_PATA_MPIIX is not set |
| 647 | # CONFIG_PATA_OLDPIIX is not set | 672 | # CONFIG_PATA_OLDPIIX is not set |
| 648 | # CONFIG_PATA_NETCELL is not set | 673 | # CONFIG_PATA_NETCELL is not set |
| 674 | # CONFIG_PATA_NINJA32 is not set | ||
| 649 | # CONFIG_PATA_NS87410 is not set | 675 | # CONFIG_PATA_NS87410 is not set |
| 650 | # CONFIG_PATA_NS87415 is not set | 676 | # CONFIG_PATA_NS87415 is not set |
| 651 | # CONFIG_PATA_OPTI is not set | 677 | # CONFIG_PATA_OPTI is not set |
| @@ -699,7 +725,6 @@ CONFIG_DUMMY=y | |||
| 699 | # CONFIG_EQUALIZER is not set | 725 | # CONFIG_EQUALIZER is not set |
| 700 | # CONFIG_TUN is not set | 726 | # CONFIG_TUN is not set |
| 701 | # CONFIG_VETH is not set | 727 | # CONFIG_VETH is not set |
| 702 | # CONFIG_IP1000 is not set | ||
| 703 | # CONFIG_ARCNET is not set | 728 | # CONFIG_ARCNET is not set |
| 704 | CONFIG_PHYLIB=y | 729 | CONFIG_PHYLIB=y |
| 705 | 730 | ||
| @@ -715,6 +740,7 @@ CONFIG_MARVELL_PHY=y | |||
| 715 | # CONFIG_SMSC_PHY is not set | 740 | # CONFIG_SMSC_PHY is not set |
| 716 | # CONFIG_BROADCOM_PHY is not set | 741 | # CONFIG_BROADCOM_PHY is not set |
| 717 | # CONFIG_ICPLUS_PHY is not set | 742 | # CONFIG_ICPLUS_PHY is not set |
| 743 | # CONFIG_REALTEK_PHY is not set | ||
| 718 | # CONFIG_FIXED_PHY is not set | 744 | # CONFIG_FIXED_PHY is not set |
| 719 | # CONFIG_MDIO_BITBANG is not set | 745 | # CONFIG_MDIO_BITBANG is not set |
| 720 | CONFIG_NET_ETHERNET=y | 746 | CONFIG_NET_ETHERNET=y |
| @@ -742,6 +768,7 @@ CONFIG_NET_PCI=y | |||
| 742 | # CONFIG_NE2K_PCI is not set | 768 | # CONFIG_NE2K_PCI is not set |
| 743 | # CONFIG_8139CP is not set | 769 | # CONFIG_8139CP is not set |
| 744 | # CONFIG_8139TOO is not set | 770 | # CONFIG_8139TOO is not set |
| 771 | # CONFIG_R6040 is not set | ||
| 745 | # CONFIG_SIS900 is not set | 772 | # CONFIG_SIS900 is not set |
| 746 | # CONFIG_EPIC100 is not set | 773 | # CONFIG_EPIC100 is not set |
| 747 | # CONFIG_SUNDANCE is not set | 774 | # CONFIG_SUNDANCE is not set |
| @@ -754,6 +781,9 @@ CONFIG_E1000=y | |||
| 754 | CONFIG_E1000_NAPI=y | 781 | CONFIG_E1000_NAPI=y |
| 755 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 782 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 756 | # CONFIG_E1000E is not set | 783 | # CONFIG_E1000E is not set |
| 784 | # CONFIG_E1000E_ENABLED is not set | ||
| 785 | # CONFIG_IP1000 is not set | ||
| 786 | # CONFIG_IGB is not set | ||
| 757 | # CONFIG_NS83820 is not set | 787 | # CONFIG_NS83820 is not set |
| 758 | # CONFIG_HAMACHI is not set | 788 | # CONFIG_HAMACHI is not set |
| 759 | # CONFIG_YELLOWFIN is not set | 789 | # CONFIG_YELLOWFIN is not set |
| @@ -779,6 +809,7 @@ CONFIG_NETDEV_10000=y | |||
| 779 | CONFIG_PASEMI_MAC=y | 809 | CONFIG_PASEMI_MAC=y |
| 780 | # CONFIG_MLX4_CORE is not set | 810 | # CONFIG_MLX4_CORE is not set |
| 781 | # CONFIG_TEHUTI is not set | 811 | # CONFIG_TEHUTI is not set |
| 812 | # CONFIG_BNX2X is not set | ||
| 782 | # CONFIG_TR is not set | 813 | # CONFIG_TR is not set |
| 783 | 814 | ||
| 784 | # | 815 | # |
| @@ -802,7 +833,6 @@ CONFIG_PASEMI_MAC=y | |||
| 802 | # CONFIG_PPP is not set | 833 | # CONFIG_PPP is not set |
| 803 | # CONFIG_SLIP is not set | 834 | # CONFIG_SLIP is not set |
| 804 | # CONFIG_NET_FC is not set | 835 | # CONFIG_NET_FC is not set |
| 805 | # CONFIG_SHAPER is not set | ||
| 806 | # CONFIG_NETCONSOLE is not set | 836 | # CONFIG_NETCONSOLE is not set |
| 807 | # CONFIG_NETPOLL is not set | 837 | # CONFIG_NETPOLL is not set |
| 808 | # CONFIG_NET_POLL_CONTROLLER is not set | 838 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -861,6 +891,7 @@ CONFIG_VT_CONSOLE=y | |||
| 861 | CONFIG_HW_CONSOLE=y | 891 | CONFIG_HW_CONSOLE=y |
| 862 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 892 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 863 | # CONFIG_SERIAL_NONSTANDARD is not set | 893 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 894 | # CONFIG_NOZOMI is not set | ||
| 864 | 895 | ||
| 865 | # | 896 | # |
| 866 | # Serial drivers | 897 | # Serial drivers |
| @@ -886,8 +917,7 @@ CONFIG_LEGACY_PTY_COUNT=4 | |||
| 886 | # CONFIG_IPMI_HANDLER is not set | 917 | # CONFIG_IPMI_HANDLER is not set |
| 887 | CONFIG_HW_RANDOM=y | 918 | CONFIG_HW_RANDOM=y |
| 888 | CONFIG_HW_RANDOM_PASEMI=y | 919 | CONFIG_HW_RANDOM_PASEMI=y |
| 889 | CONFIG_GEN_RTC=y | 920 | # CONFIG_GEN_RTC is not set |
| 890 | CONFIG_GEN_RTC_X=y | ||
| 891 | # CONFIG_R3964 is not set | 921 | # CONFIG_R3964 is not set |
| 892 | # CONFIG_APPLICOM is not set | 922 | # CONFIG_APPLICOM is not set |
| 893 | 923 | ||
| @@ -897,6 +927,7 @@ CONFIG_GEN_RTC_X=y | |||
| 897 | # CONFIG_SYNCLINK_CS is not set | 927 | # CONFIG_SYNCLINK_CS is not set |
| 898 | # CONFIG_CARDMAN_4000 is not set | 928 | # CONFIG_CARDMAN_4000 is not set |
| 899 | # CONFIG_CARDMAN_4040 is not set | 929 | # CONFIG_CARDMAN_4040 is not set |
| 930 | # CONFIG_IPWIRELESS is not set | ||
| 900 | CONFIG_RAW_DRIVER=y | 931 | CONFIG_RAW_DRIVER=y |
| 901 | CONFIG_MAX_RAW_DEVS=256 | 932 | CONFIG_MAX_RAW_DEVS=256 |
| 902 | # CONFIG_HANGCHECK_TIMER is not set | 933 | # CONFIG_HANGCHECK_TIMER is not set |
| @@ -944,13 +975,12 @@ CONFIG_I2C_PASEMI=y | |||
| 944 | # | 975 | # |
| 945 | # Miscellaneous I2C Chip support | 976 | # Miscellaneous I2C Chip support |
| 946 | # | 977 | # |
| 947 | # CONFIG_SENSORS_DS1337 is not set | ||
| 948 | # CONFIG_SENSORS_DS1374 is not set | ||
| 949 | # CONFIG_DS1682 is not set | 978 | # CONFIG_DS1682 is not set |
| 950 | CONFIG_SENSORS_EEPROM=y | 979 | CONFIG_SENSORS_EEPROM=y |
| 951 | # CONFIG_SENSORS_PCF8574 is not set | 980 | # CONFIG_SENSORS_PCF8574 is not set |
| 952 | # CONFIG_SENSORS_PCA9539 is not set | 981 | # CONFIG_PCF8575 is not set |
| 953 | # CONFIG_SENSORS_PCF8591 is not set | 982 | # CONFIG_SENSORS_PCF8591 is not set |
| 983 | # CONFIG_TPS65010 is not set | ||
| 954 | # CONFIG_SENSORS_MAX6875 is not set | 984 | # CONFIG_SENSORS_MAX6875 is not set |
| 955 | # CONFIG_SENSORS_TSL2550 is not set | 985 | # CONFIG_SENSORS_TSL2550 is not set |
| 956 | # CONFIG_I2C_DEBUG_CORE is not set | 986 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -975,6 +1005,7 @@ CONFIG_HWMON_VID=y | |||
| 975 | # CONFIG_SENSORS_ADM1031 is not set | 1005 | # CONFIG_SENSORS_ADM1031 is not set |
| 976 | # CONFIG_SENSORS_ADM9240 is not set | 1006 | # CONFIG_SENSORS_ADM9240 is not set |
| 977 | # CONFIG_SENSORS_ADT7470 is not set | 1007 | # CONFIG_SENSORS_ADT7470 is not set |
| 1008 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 978 | # CONFIG_SENSORS_ATXP1 is not set | 1009 | # CONFIG_SENSORS_ATXP1 is not set |
| 979 | # CONFIG_SENSORS_DS1621 is not set | 1010 | # CONFIG_SENSORS_DS1621 is not set |
| 980 | # CONFIG_SENSORS_I5K_AMB is not set | 1011 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1004,6 +1035,7 @@ CONFIG_SENSORS_LM90=y | |||
| 1004 | # CONFIG_SENSORS_SMSC47M1 is not set | 1035 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 1005 | # CONFIG_SENSORS_SMSC47M192 is not set | 1036 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1006 | # CONFIG_SENSORS_SMSC47B397 is not set | 1037 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1038 | # CONFIG_SENSORS_ADS7828 is not set | ||
| 1007 | # CONFIG_SENSORS_THMC50 is not set | 1039 | # CONFIG_SENSORS_THMC50 is not set |
| 1008 | # CONFIG_SENSORS_VIA686A is not set | 1040 | # CONFIG_SENSORS_VIA686A is not set |
| 1009 | # CONFIG_SENSORS_VT1211 is not set | 1041 | # CONFIG_SENSORS_VT1211 is not set |
| @@ -1013,9 +1045,11 @@ CONFIG_SENSORS_LM90=y | |||
| 1013 | # CONFIG_SENSORS_W83792D is not set | 1045 | # CONFIG_SENSORS_W83792D is not set |
| 1014 | # CONFIG_SENSORS_W83793 is not set | 1046 | # CONFIG_SENSORS_W83793 is not set |
| 1015 | # CONFIG_SENSORS_W83L785TS is not set | 1047 | # CONFIG_SENSORS_W83L785TS is not set |
| 1048 | # CONFIG_SENSORS_W83L786NG is not set | ||
| 1016 | # CONFIG_SENSORS_W83627HF is not set | 1049 | # CONFIG_SENSORS_W83627HF is not set |
| 1017 | # CONFIG_SENSORS_W83627EHF is not set | 1050 | # CONFIG_SENSORS_W83627EHF is not set |
| 1018 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1051 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 1052 | # CONFIG_THERMAL is not set | ||
| 1019 | # CONFIG_WATCHDOG is not set | 1053 | # CONFIG_WATCHDOG is not set |
| 1020 | 1054 | ||
| 1021 | # | 1055 | # |
| @@ -1183,6 +1217,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1183 | # CONFIG_SND_BT87X is not set | 1217 | # CONFIG_SND_BT87X is not set |
| 1184 | # CONFIG_SND_CA0106 is not set | 1218 | # CONFIG_SND_CA0106 is not set |
| 1185 | # CONFIG_SND_CMIPCI is not set | 1219 | # CONFIG_SND_CMIPCI is not set |
| 1220 | # CONFIG_SND_OXYGEN is not set | ||
| 1186 | # CONFIG_SND_CS4281 is not set | 1221 | # CONFIG_SND_CS4281 is not set |
| 1187 | # CONFIG_SND_CS46XX is not set | 1222 | # CONFIG_SND_CS46XX is not set |
| 1188 | # CONFIG_SND_CS5530 is not set | 1223 | # CONFIG_SND_CS5530 is not set |
| @@ -1208,6 +1243,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1208 | # CONFIG_SND_HDA_INTEL is not set | 1243 | # CONFIG_SND_HDA_INTEL is not set |
| 1209 | # CONFIG_SND_HDSP is not set | 1244 | # CONFIG_SND_HDSP is not set |
| 1210 | # CONFIG_SND_HDSPM is not set | 1245 | # CONFIG_SND_HDSPM is not set |
| 1246 | # CONFIG_SND_HIFIER is not set | ||
| 1211 | # CONFIG_SND_ICE1712 is not set | 1247 | # CONFIG_SND_ICE1712 is not set |
| 1212 | # CONFIG_SND_ICE1724 is not set | 1248 | # CONFIG_SND_ICE1724 is not set |
| 1213 | # CONFIG_SND_INTEL8X0 is not set | 1249 | # CONFIG_SND_INTEL8X0 is not set |
| @@ -1225,6 +1261,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1225 | # CONFIG_SND_TRIDENT is not set | 1261 | # CONFIG_SND_TRIDENT is not set |
| 1226 | # CONFIG_SND_VIA82XX is not set | 1262 | # CONFIG_SND_VIA82XX is not set |
| 1227 | # CONFIG_SND_VIA82XX_MODEM is not set | 1263 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 1264 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1228 | # CONFIG_SND_VX222 is not set | 1265 | # CONFIG_SND_VX222 is not set |
| 1229 | # CONFIG_SND_YMFPCI is not set | 1266 | # CONFIG_SND_YMFPCI is not set |
| 1230 | 1267 | ||
| @@ -1259,6 +1296,10 @@ CONFIG_SND_USB_USX2Y=y | |||
| 1259 | # | 1296 | # |
| 1260 | 1297 | ||
| 1261 | # | 1298 | # |
| 1299 | # ALSA SoC audio for Freescale SOCs | ||
| 1300 | # | ||
| 1301 | |||
| 1302 | # | ||
| 1262 | # Open Sound System | 1303 | # Open Sound System |
| 1263 | # | 1304 | # |
| 1264 | # CONFIG_SOUND_PRIME is not set | 1305 | # CONFIG_SOUND_PRIME is not set |
| @@ -1280,6 +1321,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 1280 | CONFIG_USB_ARCH_HAS_EHCI=y | 1321 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1281 | CONFIG_USB=y | 1322 | CONFIG_USB=y |
| 1282 | # CONFIG_USB_DEBUG is not set | 1323 | # CONFIG_USB_DEBUG is not set |
| 1324 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 1283 | 1325 | ||
| 1284 | # | 1326 | # |
| 1285 | # Miscellaneous USB options | 1327 | # Miscellaneous USB options |
| @@ -1293,17 +1335,14 @@ CONFIG_USB_DEVICEFS=y | |||
| 1293 | # USB Host Controller Drivers | 1335 | # USB Host Controller Drivers |
| 1294 | # | 1336 | # |
| 1295 | CONFIG_USB_EHCI_HCD=y | 1337 | CONFIG_USB_EHCI_HCD=y |
| 1296 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 1297 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1338 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1298 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1339 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1340 | CONFIG_USB_EHCI_HCD_PPC_OF=y | ||
| 1299 | # CONFIG_USB_ISP116X_HCD is not set | 1341 | # CONFIG_USB_ISP116X_HCD is not set |
| 1300 | CONFIG_USB_OHCI_HCD=y | 1342 | CONFIG_USB_OHCI_HCD=y |
| 1301 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1343 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1302 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1344 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 1303 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 1345 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| 1304 | CONFIG_USB_OHCI_HCD_PCI=y | ||
| 1305 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | ||
| 1306 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | ||
| 1307 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1346 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1308 | CONFIG_USB_UHCI_HCD=y | 1347 | CONFIG_USB_UHCI_HCD=y |
| 1309 | CONFIG_USB_SL811_HCD=y | 1348 | CONFIG_USB_SL811_HCD=y |
| @@ -1348,10 +1387,6 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1348 | # | 1387 | # |
| 1349 | # USB port drivers | 1388 | # USB port drivers |
| 1350 | # | 1389 | # |
| 1351 | |||
| 1352 | # | ||
| 1353 | # USB Serial Converter support | ||
| 1354 | # | ||
| 1355 | # CONFIG_USB_SERIAL is not set | 1390 | # CONFIG_USB_SERIAL is not set |
| 1356 | 1391 | ||
| 1357 | # | 1392 | # |
| @@ -1377,16 +1412,9 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1377 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1412 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1378 | # CONFIG_USB_IOWARRIOR is not set | 1413 | # CONFIG_USB_IOWARRIOR is not set |
| 1379 | # CONFIG_USB_TEST is not set | 1414 | # CONFIG_USB_TEST is not set |
| 1380 | |||
| 1381 | # | ||
| 1382 | # USB DSL modem support | ||
| 1383 | # | ||
| 1384 | |||
| 1385 | # | ||
| 1386 | # USB Gadget Support | ||
| 1387 | # | ||
| 1388 | # CONFIG_USB_GADGET is not set | 1415 | # CONFIG_USB_GADGET is not set |
| 1389 | # CONFIG_MMC is not set | 1416 | # CONFIG_MMC is not set |
| 1417 | # CONFIG_MEMSTICK is not set | ||
| 1390 | # CONFIG_NEW_LEDS is not set | 1418 | # CONFIG_NEW_LEDS is not set |
| 1391 | # CONFIG_INFINIBAND is not set | 1419 | # CONFIG_INFINIBAND is not set |
| 1392 | CONFIG_EDAC=y | 1420 | CONFIG_EDAC=y |
| @@ -1425,6 +1453,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1425 | # CONFIG_RTC_DRV_PCF8563 is not set | 1453 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1426 | # CONFIG_RTC_DRV_PCF8583 is not set | 1454 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1427 | # CONFIG_RTC_DRV_M41T80 is not set | 1455 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1456 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1428 | 1457 | ||
| 1429 | # | 1458 | # |
| 1430 | # SPI RTC drivers | 1459 | # SPI RTC drivers |
| @@ -1434,9 +1463,10 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1434 | # Platform RTC drivers | 1463 | # Platform RTC drivers |
| 1435 | # | 1464 | # |
| 1436 | # CONFIG_RTC_DRV_CMOS is not set | 1465 | # CONFIG_RTC_DRV_CMOS is not set |
| 1466 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1437 | # CONFIG_RTC_DRV_DS1553 is not set | 1467 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1438 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1439 | # CONFIG_RTC_DRV_DS1742 is not set | 1468 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1469 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1440 | # CONFIG_RTC_DRV_M48T86 is not set | 1470 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1441 | # CONFIG_RTC_DRV_M48T59 is not set | 1471 | # CONFIG_RTC_DRV_M48T59 is not set |
| 1442 | # CONFIG_RTC_DRV_V3020 is not set | 1472 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -1444,6 +1474,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1444 | # | 1474 | # |
| 1445 | # on-CPU RTC drivers | 1475 | # on-CPU RTC drivers |
| 1446 | # | 1476 | # |
| 1477 | # CONFIG_DMADEVICES is not set | ||
| 1447 | 1478 | ||
| 1448 | # | 1479 | # |
| 1449 | # Userspace I/O | 1480 | # Userspace I/O |
| @@ -1471,12 +1502,10 @@ CONFIG_FS_POSIX_ACL=y | |||
| 1471 | # CONFIG_XFS_FS is not set | 1502 | # CONFIG_XFS_FS is not set |
| 1472 | # CONFIG_GFS2_FS is not set | 1503 | # CONFIG_GFS2_FS is not set |
| 1473 | # CONFIG_OCFS2_FS is not set | 1504 | # CONFIG_OCFS2_FS is not set |
| 1474 | # CONFIG_MINIX_FS is not set | 1505 | CONFIG_DNOTIFY=y |
| 1475 | # CONFIG_ROMFS_FS is not set | ||
| 1476 | CONFIG_INOTIFY=y | 1506 | CONFIG_INOTIFY=y |
| 1477 | CONFIG_INOTIFY_USER=y | 1507 | CONFIG_INOTIFY_USER=y |
| 1478 | # CONFIG_QUOTA is not set | 1508 | # CONFIG_QUOTA is not set |
| 1479 | CONFIG_DNOTIFY=y | ||
| 1480 | CONFIG_AUTOFS_FS=y | 1509 | CONFIG_AUTOFS_FS=y |
| 1481 | CONFIG_AUTOFS4_FS=y | 1510 | CONFIG_AUTOFS4_FS=y |
| 1482 | # CONFIG_FUSE_FS is not set | 1511 | # CONFIG_FUSE_FS is not set |
| @@ -1536,8 +1565,10 @@ CONFIG_JFFS2_RTIME=y | |||
| 1536 | # CONFIG_JFFS2_RUBIN is not set | 1565 | # CONFIG_JFFS2_RUBIN is not set |
| 1537 | # CONFIG_CRAMFS is not set | 1566 | # CONFIG_CRAMFS is not set |
| 1538 | # CONFIG_VXFS_FS is not set | 1567 | # CONFIG_VXFS_FS is not set |
| 1568 | # CONFIG_MINIX_FS is not set | ||
| 1539 | # CONFIG_HPFS_FS is not set | 1569 | # CONFIG_HPFS_FS is not set |
| 1540 | # CONFIG_QNX4FS_FS is not set | 1570 | # CONFIG_QNX4FS_FS is not set |
| 1571 | # CONFIG_ROMFS_FS is not set | ||
| 1541 | # CONFIG_SYSV_FS is not set | 1572 | # CONFIG_SYSV_FS is not set |
| 1542 | # CONFIG_UFS_FS is not set | 1573 | # CONFIG_UFS_FS is not set |
| 1543 | CONFIG_NETWORK_FILESYSTEMS=y | 1574 | CONFIG_NETWORK_FILESYSTEMS=y |
| @@ -1629,7 +1660,6 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1629 | # CONFIG_NLS_KOI8_U is not set | 1660 | # CONFIG_NLS_KOI8_U is not set |
| 1630 | # CONFIG_NLS_UTF8 is not set | 1661 | # CONFIG_NLS_UTF8 is not set |
| 1631 | # CONFIG_DLM is not set | 1662 | # CONFIG_DLM is not set |
| 1632 | # CONFIG_UCC_SLOW is not set | ||
| 1633 | 1663 | ||
| 1634 | # | 1664 | # |
| 1635 | # Library routines | 1665 | # Library routines |
| @@ -1647,11 +1677,6 @@ CONFIG_PLIST=y | |||
| 1647 | CONFIG_HAS_IOMEM=y | 1677 | CONFIG_HAS_IOMEM=y |
| 1648 | CONFIG_HAS_IOPORT=y | 1678 | CONFIG_HAS_IOPORT=y |
| 1649 | CONFIG_HAS_DMA=y | 1679 | CONFIG_HAS_DMA=y |
| 1650 | CONFIG_INSTRUMENTATION=y | ||
| 1651 | CONFIG_PROFILING=y | ||
| 1652 | CONFIG_OPROFILE=y | ||
| 1653 | # CONFIG_KPROBES is not set | ||
| 1654 | # CONFIG_MARKERS is not set | ||
| 1655 | 1680 | ||
| 1656 | # | 1681 | # |
| 1657 | # Kernel hacking | 1682 | # Kernel hacking |
| @@ -1670,6 +1695,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1670 | # CONFIG_SCHEDSTATS is not set | 1695 | # CONFIG_SCHEDSTATS is not set |
| 1671 | # CONFIG_TIMER_STATS is not set | 1696 | # CONFIG_TIMER_STATS is not set |
| 1672 | # CONFIG_SLUB_DEBUG_ON is not set | 1697 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1698 | # CONFIG_SLUB_STATS is not set | ||
| 1673 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1699 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1674 | # CONFIG_RT_MUTEX_TESTER is not set | 1700 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1675 | # CONFIG_DEBUG_SPINLOCK is not set | 1701 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -1682,9 +1708,9 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1682 | # CONFIG_DEBUG_VM is not set | 1708 | # CONFIG_DEBUG_VM is not set |
| 1683 | # CONFIG_DEBUG_LIST is not set | 1709 | # CONFIG_DEBUG_LIST is not set |
| 1684 | # CONFIG_DEBUG_SG is not set | 1710 | # CONFIG_DEBUG_SG is not set |
| 1685 | # CONFIG_FORCED_INLINING is not set | ||
| 1686 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1711 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1687 | # CONFIG_RCU_TORTURE_TEST is not set | 1712 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1713 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1688 | # CONFIG_FAULT_INJECTION is not set | 1714 | # CONFIG_FAULT_INJECTION is not set |
| 1689 | # CONFIG_SAMPLES is not set | 1715 | # CONFIG_SAMPLES is not set |
| 1690 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1716 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| @@ -1710,7 +1736,9 @@ CONFIG_ASYNC_MEMCPY=y | |||
| 1710 | CONFIG_ASYNC_XOR=y | 1736 | CONFIG_ASYNC_XOR=y |
| 1711 | CONFIG_CRYPTO=y | 1737 | CONFIG_CRYPTO=y |
| 1712 | CONFIG_CRYPTO_ALGAPI=y | 1738 | CONFIG_CRYPTO_ALGAPI=y |
| 1739 | CONFIG_CRYPTO_AEAD=y | ||
| 1713 | CONFIG_CRYPTO_BLKCIPHER=y | 1740 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1741 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1714 | CONFIG_CRYPTO_HASH=y | 1742 | CONFIG_CRYPTO_HASH=y |
| 1715 | CONFIG_CRYPTO_MANAGER=y | 1743 | CONFIG_CRYPTO_MANAGER=y |
| 1716 | CONFIG_CRYPTO_HMAC=y | 1744 | CONFIG_CRYPTO_HMAC=y |
| @@ -1729,6 +1757,9 @@ CONFIG_CRYPTO_CBC=y | |||
| 1729 | # CONFIG_CRYPTO_PCBC is not set | 1757 | # CONFIG_CRYPTO_PCBC is not set |
| 1730 | # CONFIG_CRYPTO_LRW is not set | 1758 | # CONFIG_CRYPTO_LRW is not set |
| 1731 | # CONFIG_CRYPTO_XTS is not set | 1759 | # CONFIG_CRYPTO_XTS is not set |
| 1760 | # CONFIG_CRYPTO_CTR is not set | ||
| 1761 | # CONFIG_CRYPTO_GCM is not set | ||
| 1762 | # CONFIG_CRYPTO_CCM is not set | ||
| 1732 | # CONFIG_CRYPTO_CRYPTD is not set | 1763 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1733 | CONFIG_CRYPTO_DES=y | 1764 | CONFIG_CRYPTO_DES=y |
| 1734 | # CONFIG_CRYPTO_FCRYPT is not set | 1765 | # CONFIG_CRYPTO_FCRYPT is not set |
| @@ -1743,11 +1774,14 @@ CONFIG_CRYPTO_AES=y | |||
| 1743 | # CONFIG_CRYPTO_KHAZAD is not set | 1774 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1744 | # CONFIG_CRYPTO_ANUBIS is not set | 1775 | # CONFIG_CRYPTO_ANUBIS is not set |
| 1745 | # CONFIG_CRYPTO_SEED is not set | 1776 | # CONFIG_CRYPTO_SEED is not set |
| 1777 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1746 | # CONFIG_CRYPTO_DEFLATE is not set | 1778 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1747 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1779 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1748 | # CONFIG_CRYPTO_CRC32C is not set | 1780 | # CONFIG_CRYPTO_CRC32C is not set |
| 1749 | # CONFIG_CRYPTO_CAMELLIA is not set | 1781 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1750 | # CONFIG_CRYPTO_TEST is not set | 1782 | # CONFIG_CRYPTO_TEST is not set |
| 1751 | # CONFIG_CRYPTO_AUTHENC is not set | 1783 | CONFIG_CRYPTO_AUTHENC=y |
| 1784 | # CONFIG_CRYPTO_LZO is not set | ||
| 1752 | CONFIG_CRYPTO_HW=y | 1785 | CONFIG_CRYPTO_HW=y |
| 1786 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1753 | # CONFIG_PPC_CLOCK is not set | 1787 | # CONFIG_PPC_CLOCK is not set |
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 59311ec0d422..4ec605521504 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
| @@ -241,8 +241,12 @@ void discard_lazy_cpu_state(void) | |||
| 241 | } | 241 | } |
| 242 | #endif /* CONFIG_SMP */ | 242 | #endif /* CONFIG_SMP */ |
| 243 | 243 | ||
| 244 | static DEFINE_PER_CPU(unsigned long, current_dabr); | ||
| 245 | |||
| 244 | int set_dabr(unsigned long dabr) | 246 | int set_dabr(unsigned long dabr) |
| 245 | { | 247 | { |
| 248 | __get_cpu_var(current_dabr) = dabr; | ||
| 249 | |||
| 246 | #ifdef CONFIG_PPC_MERGE /* XXX for now */ | 250 | #ifdef CONFIG_PPC_MERGE /* XXX for now */ |
| 247 | if (ppc_md.set_dabr) | 251 | if (ppc_md.set_dabr) |
| 248 | return ppc_md.set_dabr(dabr); | 252 | return ppc_md.set_dabr(dabr); |
| @@ -259,8 +263,6 @@ int set_dabr(unsigned long dabr) | |||
| 259 | DEFINE_PER_CPU(struct cpu_usage, cpu_usage_array); | 263 | DEFINE_PER_CPU(struct cpu_usage, cpu_usage_array); |
| 260 | #endif | 264 | #endif |
| 261 | 265 | ||
| 262 | static DEFINE_PER_CPU(unsigned long, current_dabr); | ||
| 263 | |||
| 264 | struct task_struct *__switch_to(struct task_struct *prev, | 266 | struct task_struct *__switch_to(struct task_struct *prev, |
| 265 | struct task_struct *new) | 267 | struct task_struct *new) |
| 266 | { | 268 | { |
| @@ -325,10 +327,8 @@ struct task_struct *__switch_to(struct task_struct *prev, | |||
| 325 | 327 | ||
| 326 | #endif /* CONFIG_SMP */ | 328 | #endif /* CONFIG_SMP */ |
| 327 | 329 | ||
| 328 | if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr)) { | 330 | if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr)) |
| 329 | set_dabr(new->thread.dabr); | 331 | set_dabr(new->thread.dabr); |
| 330 | __get_cpu_var(current_dabr) = new->thread.dabr; | ||
| 331 | } | ||
| 332 | 332 | ||
| 333 | new_thread = &new->thread; | 333 | new_thread = &new->thread; |
| 334 | old_thread = ¤t->thread; | 334 | old_thread = ¤t->thread; |
diff --git a/arch/powerpc/oprofile/cell/vma_map.c b/arch/powerpc/oprofile/cell/vma_map.c index 76ec1d16aef7..9a932177e70e 100644 --- a/arch/powerpc/oprofile/cell/vma_map.c +++ b/arch/powerpc/oprofile/cell/vma_map.c | |||
| @@ -92,7 +92,7 @@ vma_map_add(struct vma_to_fileoffset_map *map, unsigned int vma, | |||
| 92 | * A pointer to the first vma_map in the generated list | 92 | * A pointer to the first vma_map in the generated list |
| 93 | * of vma_maps is returned. */ | 93 | * of vma_maps is returned. */ |
| 94 | struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | 94 | struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, |
| 95 | unsigned long spu_elf_start) | 95 | unsigned long __spu_elf_start) |
| 96 | { | 96 | { |
| 97 | static const unsigned char expected[EI_PAD] = { | 97 | static const unsigned char expected[EI_PAD] = { |
| 98 | [EI_MAG0] = ELFMAG0, | 98 | [EI_MAG0] = ELFMAG0, |
| @@ -107,9 +107,11 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
| 107 | 107 | ||
| 108 | int grd_val; | 108 | int grd_val; |
| 109 | struct vma_to_fileoffset_map *map = NULL; | 109 | struct vma_to_fileoffset_map *map = NULL; |
| 110 | void __user *spu_elf_start = (void __user *)__spu_elf_start; | ||
| 110 | struct spu_overlay_info ovly; | 111 | struct spu_overlay_info ovly; |
| 111 | unsigned int overlay_tbl_offset = -1; | 112 | unsigned int overlay_tbl_offset = -1; |
| 112 | unsigned long phdr_start, shdr_start; | 113 | Elf32_Phdr __user *phdr_start; |
| 114 | Elf32_Shdr __user *shdr_start; | ||
| 113 | Elf32_Ehdr ehdr; | 115 | Elf32_Ehdr ehdr; |
| 114 | Elf32_Phdr phdr; | 116 | Elf32_Phdr phdr; |
| 115 | Elf32_Shdr shdr, shdr_str; | 117 | Elf32_Shdr shdr, shdr_str; |
| @@ -121,12 +123,12 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
| 121 | unsigned int ovly_buf_table_sym = 0; | 123 | unsigned int ovly_buf_table_sym = 0; |
| 122 | unsigned int ovly_table_end_sym = 0; | 124 | unsigned int ovly_table_end_sym = 0; |
| 123 | unsigned int ovly_buf_table_end_sym = 0; | 125 | unsigned int ovly_buf_table_end_sym = 0; |
| 124 | unsigned long ovly_table; | 126 | struct spu_overlay_info __user *ovly_table; |
| 125 | unsigned int n_ovlys; | 127 | unsigned int n_ovlys; |
| 126 | 128 | ||
| 127 | /* Get and validate ELF header. */ | 129 | /* Get and validate ELF header. */ |
| 128 | 130 | ||
| 129 | if (copy_from_user(&ehdr, (void *) spu_elf_start, sizeof (ehdr))) | 131 | if (copy_from_user(&ehdr, spu_elf_start, sizeof (ehdr))) |
| 130 | goto fail; | 132 | goto fail; |
| 131 | 133 | ||
| 132 | if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) { | 134 | if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) { |
| @@ -152,9 +154,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
| 152 | 154 | ||
| 153 | /* Traverse program headers. */ | 155 | /* Traverse program headers. */ |
| 154 | for (i = 0; i < ehdr.e_phnum; i++) { | 156 | for (i = 0; i < ehdr.e_phnum; i++) { |
| 155 | if (copy_from_user(&phdr, | 157 | if (copy_from_user(&phdr, phdr_start + i, sizeof(phdr))) |
| 156 | (void *) (phdr_start + i * sizeof(phdr)), | ||
| 157 | sizeof(phdr))) | ||
| 158 | goto fail; | 158 | goto fail; |
| 159 | 159 | ||
| 160 | if (phdr.p_type != PT_LOAD) | 160 | if (phdr.p_type != PT_LOAD) |
| @@ -171,9 +171,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
| 171 | pr_debug("SPU_PROF: Created non-overlay maps\n"); | 171 | pr_debug("SPU_PROF: Created non-overlay maps\n"); |
| 172 | /* Traverse section table and search for overlay-related symbols. */ | 172 | /* Traverse section table and search for overlay-related symbols. */ |
| 173 | for (i = 0; i < ehdr.e_shnum; i++) { | 173 | for (i = 0; i < ehdr.e_shnum; i++) { |
| 174 | if (copy_from_user(&shdr, | 174 | if (copy_from_user(&shdr, shdr_start + i, sizeof(shdr))) |
| 175 | (void *) (shdr_start + i * sizeof(shdr)), | ||
| 176 | sizeof(shdr))) | ||
| 177 | goto fail; | 175 | goto fail; |
| 178 | 176 | ||
| 179 | if (shdr.sh_type != SHT_SYMTAB) | 177 | if (shdr.sh_type != SHT_SYMTAB) |
| @@ -182,8 +180,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
| 182 | continue; | 180 | continue; |
| 183 | 181 | ||
| 184 | if (copy_from_user(&shdr_str, | 182 | if (copy_from_user(&shdr_str, |
| 185 | (void *) (shdr_start + shdr.sh_link * | 183 | shdr_start + shdr.sh_link, |
| 186 | sizeof(shdr)), | ||
| 187 | sizeof(shdr))) | 184 | sizeof(shdr))) |
| 188 | goto fail; | 185 | goto fail; |
| 189 | 186 | ||
| @@ -191,15 +188,15 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
| 191 | goto fail;; | 188 | goto fail;; |
| 192 | 189 | ||
| 193 | for (j = 0; j < shdr.sh_size / sizeof (sym); j++) { | 190 | for (j = 0; j < shdr.sh_size / sizeof (sym); j++) { |
| 194 | if (copy_from_user(&sym, (void *) (spu_elf_start + | 191 | if (copy_from_user(&sym, spu_elf_start + |
| 195 | shdr.sh_offset + j * | 192 | shdr.sh_offset + |
| 196 | sizeof (sym)), | 193 | j * sizeof (sym), |
| 197 | sizeof (sym))) | 194 | sizeof (sym))) |
| 198 | goto fail; | 195 | goto fail; |
| 199 | 196 | ||
| 200 | if (copy_from_user(name, (void *) | 197 | if (copy_from_user(name, |
| 201 | (spu_elf_start + shdr_str.sh_offset + | 198 | spu_elf_start + shdr_str.sh_offset + |
| 202 | sym.st_name), | 199 | sym.st_name, |
| 203 | 20)) | 200 | 20)) |
| 204 | goto fail; | 201 | goto fail; |
| 205 | 202 | ||
| @@ -245,9 +242,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
| 245 | 242 | ||
| 246 | /* Traverse overlay table. */ | 243 | /* Traverse overlay table. */ |
| 247 | for (i = 0; i < n_ovlys; i++) { | 244 | for (i = 0; i < n_ovlys; i++) { |
| 248 | if (copy_from_user(&ovly, (void *) | 245 | if (copy_from_user(&ovly, ovly_table + i, sizeof (ovly))) |
| 249 | (ovly_table + i * sizeof (ovly)), | ||
| 250 | sizeof (ovly))) | ||
| 251 | goto fail; | 246 | goto fail; |
| 252 | 247 | ||
| 253 | /* The ovly.vma/size/offset arguments are analogous to the same | 248 | /* The ovly.vma/size/offset arguments are analogous to the same |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index ca52b587166d..a977f200db89 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
| @@ -763,7 +763,7 @@ void xics_request_IPIs(void) | |||
| 763 | } | 763 | } |
| 764 | #endif /* CONFIG_SMP */ | 764 | #endif /* CONFIG_SMP */ |
| 765 | 765 | ||
| 766 | void xics_teardown_cpu() | 766 | void xics_teardown_cpu(void) |
| 767 | { | 767 | { |
| 768 | int cpu = smp_processor_id(); | 768 | int cpu = smp_processor_id(); |
| 769 | 769 | ||
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 12720489e458..8d2cd1de5726 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -72,9 +72,6 @@ config SYS_SUPPORTS_NUMA | |||
| 72 | config SYS_SUPPORTS_PCI | 72 | config SYS_SUPPORTS_PCI |
| 73 | bool | 73 | bool |
| 74 | 74 | ||
| 75 | config ARCH_MAY_HAVE_PC_FDC | ||
| 76 | bool | ||
| 77 | |||
| 78 | config STACKTRACE_SUPPORT | 75 | config STACKTRACE_SUPPORT |
| 79 | def_bool y | 76 | def_bool y |
| 80 | 77 | ||
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile index 3dda24daa0a8..89b408620dcb 100644 --- a/arch/sh/boot/Makefile +++ b/arch/sh/boot/Makefile | |||
| @@ -44,7 +44,7 @@ KERNEL_ENTRY := $(shell /bin/bash -c 'printf "0x%08x" \ | |||
| 44 | 44 | ||
| 45 | quiet_cmd_uimage = UIMAGE $@ | 45 | quiet_cmd_uimage = UIMAGE $@ |
| 46 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \ | 46 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \ |
| 47 | -C none -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \ | 47 | -C gzip -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \ |
| 48 | -n 'Linux-$(KERNELRELEASE)' -d $< $@ | 48 | -n 'Linux-$(KERNELRELEASE)' -d $< $@ |
| 49 | 49 | ||
| 50 | $(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE | 50 | $(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE |
diff --git a/arch/sh/kernel/cpu/sh2a/fpu.c b/arch/sh/kernel/cpu/sh2a/fpu.c index ff99562456fb..5627c0b3ffa8 100644 --- a/arch/sh/kernel/cpu/sh2a/fpu.c +++ b/arch/sh/kernel/cpu/sh2a/fpu.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/signal.h> | 13 | #include <linux/signal.h> |
| 14 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
| 15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 16 | #include <asm/fpu.h> | ||
| 16 | 17 | ||
| 17 | /* The PR (precision) bit in the FP Status Register must be clear when | 18 | /* The PR (precision) bit in the FP Status Register must be clear when |
| 18 | * an frchg instruction is executed, otherwise the instruction is undefined. | 19 | * an frchg instruction is executed, otherwise the instruction is undefined. |
diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c index 817f9939cda6..8020796139f1 100644 --- a/arch/sh/kernel/cpu/sh4/fpu.c +++ b/arch/sh/kernel/cpu/sh4/fpu.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <asm/cpu/fpu.h> | 16 | #include <asm/cpu/fpu.h> |
| 17 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
| 18 | #include <asm/system.h> | 18 | #include <asm/system.h> |
| 19 | #include <asm/fpu.h> | ||
| 19 | 20 | ||
| 20 | /* The PR (precision) bit in the FP Status Register must be clear when | 21 | /* The PR (precision) bit in the FP Status Register must be clear when |
| 21 | * an frchg instruction is executed, otherwise the instruction is undefined. | 22 | * an frchg instruction is executed, otherwise the instruction is undefined. |
diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c index 30b76a94abf2..dd4f51ffb50e 100644 --- a/arch/sh/kernel/cpu/sh5/fpu.c +++ b/arch/sh/kernel/cpu/sh5/fpu.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
| 18 | #include <asm/user.h> | 18 | #include <asm/user.h> |
| 19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 20 | #include <asm/fpu.h> | ||
| 20 | 21 | ||
| 21 | /* | 22 | /* |
| 22 | * Initially load the FPU with signalling NANS. This bit pattern | 23 | * Initially load the FPU with signalling NANS. This bit pattern |
diff --git a/arch/sh/kernel/dump_task.c b/arch/sh/kernel/dump_task.c index 4a8a4083ff0b..1db7ce0f25d4 100644 --- a/arch/sh/kernel/dump_task.c +++ b/arch/sh/kernel/dump_task.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/elfcore.h> | 1 | #include <linux/elfcore.h> |
| 2 | #include <linux/sched.h> | 2 | #include <linux/sched.h> |
| 3 | #include <asm/fpu.h> | ||
| 3 | 4 | ||
| 4 | /* | 5 | /* |
| 5 | * Capture the user space registers if the task is not running (in user space) | 6 | * Capture the user space registers if the task is not running (in user space) |
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c index 9ab1926b9d10..b98e37a1f54c 100644 --- a/arch/sh/kernel/process_32.c +++ b/arch/sh/kernel/process_32.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <asm/pgalloc.h> | 25 | #include <asm/pgalloc.h> |
| 26 | #include <asm/system.h> | 26 | #include <asm/system.h> |
| 27 | #include <asm/ubc.h> | 27 | #include <asm/ubc.h> |
| 28 | #include <asm/fpu.h> | ||
| 28 | 29 | ||
| 29 | static int hlt_counter; | 30 | static int hlt_counter; |
| 30 | int ubc_usercnt = 0; | 31 | int ubc_usercnt = 0; |
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c index f6b5fbfe75c4..f311551d9a05 100644 --- a/arch/sh/kernel/signal_32.c +++ b/arch/sh/kernel/signal_32.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| 30 | #include <asm/pgtable.h> | 30 | #include <asm/pgtable.h> |
| 31 | #include <asm/cacheflush.h> | 31 | #include <asm/cacheflush.h> |
| 32 | #include <asm/fpu.h> | ||
| 32 | 33 | ||
| 33 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | 34 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) |
| 34 | 35 | ||
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 250958d1e3cb..9d4bd2229493 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc1 | 3 | # Linux kernel version: 2.6.25-rc3 |
| 4 | # Sun Feb 17 22:44:12 2008 | 4 | # Wed Mar 26 04:33:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_SPARC=y | 6 | CONFIG_SPARC=y |
| 7 | CONFIG_SPARC64=y | 7 | CONFIG_SPARC64=y |
| @@ -55,9 +55,11 @@ CONFIG_POSIX_MQUEUE=y | |||
| 55 | # CONFIG_IKCONFIG is not set | 55 | # CONFIG_IKCONFIG is not set |
| 56 | CONFIG_LOG_BUF_SHIFT=18 | 56 | CONFIG_LOG_BUF_SHIFT=18 |
| 57 | # CONFIG_CGROUPS is not set | 57 | # CONFIG_CGROUPS is not set |
| 58 | CONFIG_GROUP_SCHED=y | ||
| 58 | CONFIG_FAIR_GROUP_SCHED=y | 59 | CONFIG_FAIR_GROUP_SCHED=y |
| 59 | CONFIG_FAIR_USER_SCHED=y | 60 | CONFIG_RT_GROUP_SCHED=y |
| 60 | # CONFIG_FAIR_CGROUP_SCHED is not set | 61 | CONFIG_USER_SCHED=y |
| 62 | # CONFIG_CGROUP_SCHED is not set | ||
| 61 | CONFIG_SYSFS_DEPRECATED=y | 63 | CONFIG_SYSFS_DEPRECATED=y |
| 62 | CONFIG_RELAY=y | 64 | CONFIG_RELAY=y |
| 63 | CONFIG_NAMESPACES=y | 65 | CONFIG_NAMESPACES=y |
| @@ -482,6 +484,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 482 | # CONFIG_SCSI_IPS is not set | 484 | # CONFIG_SCSI_IPS is not set |
| 483 | # CONFIG_SCSI_INITIO is not set | 485 | # CONFIG_SCSI_INITIO is not set |
| 484 | # CONFIG_SCSI_INIA100 is not set | 486 | # CONFIG_SCSI_INIA100 is not set |
| 487 | # CONFIG_SCSI_MVSAS is not set | ||
| 485 | # CONFIG_SCSI_STEX is not set | 488 | # CONFIG_SCSI_STEX is not set |
| 486 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 489 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 487 | # CONFIG_SCSI_QLOGIC_1280 is not set | 490 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| @@ -810,6 +813,7 @@ CONFIG_HWMON=y | |||
| 810 | # CONFIG_SENSORS_ADM1031 is not set | 813 | # CONFIG_SENSORS_ADM1031 is not set |
| 811 | # CONFIG_SENSORS_ADM9240 is not set | 814 | # CONFIG_SENSORS_ADM9240 is not set |
| 812 | # CONFIG_SENSORS_ADT7470 is not set | 815 | # CONFIG_SENSORS_ADT7470 is not set |
| 816 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 813 | # CONFIG_SENSORS_ATXP1 is not set | 817 | # CONFIG_SENSORS_ATXP1 is not set |
| 814 | # CONFIG_SENSORS_DS1621 is not set | 818 | # CONFIG_SENSORS_DS1621 is not set |
| 815 | # CONFIG_SENSORS_I5K_AMB is not set | 819 | # CONFIG_SENSORS_I5K_AMB is not set |
diff --git a/arch/sparc64/kernel/cpu.c b/arch/sparc64/kernel/cpu.c index dd5d28e3d798..0097c08dc600 100644 --- a/arch/sparc64/kernel/cpu.c +++ b/arch/sparc64/kernel/cpu.c | |||
| @@ -15,6 +15,8 @@ | |||
| 15 | #include <asm/spitfire.h> | 15 | #include <asm/spitfire.h> |
| 16 | #include <asm/oplib.h> | 16 | #include <asm/oplib.h> |
| 17 | 17 | ||
| 18 | #include "entry.h" | ||
| 19 | |||
| 18 | DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 }; | 20 | DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 }; |
| 19 | 21 | ||
| 20 | struct cpu_iu_info { | 22 | struct cpu_iu_info { |
| @@ -65,8 +67,6 @@ static struct cpu_iu_info linux_sparc_chips[] = { | |||
| 65 | char *sparc_cpu_type; | 67 | char *sparc_cpu_type; |
| 66 | char *sparc_fpu_type; | 68 | char *sparc_fpu_type; |
| 67 | 69 | ||
| 68 | unsigned int fsr_storage; | ||
| 69 | |||
| 70 | static void __init sun4v_cpu_probe(void) | 70 | static void __init sun4v_cpu_probe(void) |
| 71 | { | 71 | { |
| 72 | switch (sun4v_chip_type) { | 72 | switch (sun4v_chip_type) { |
| @@ -94,8 +94,10 @@ void __init cpu_probe(void) | |||
| 94 | unsigned long ver, fpu_vers, manuf, impl, fprs; | 94 | unsigned long ver, fpu_vers, manuf, impl, fprs; |
| 95 | int i; | 95 | int i; |
| 96 | 96 | ||
| 97 | if (tlb_type == hypervisor) | 97 | if (tlb_type == hypervisor) { |
| 98 | return sun4v_cpu_probe(); | 98 | sun4v_cpu_probe(); |
| 99 | return; | ||
| 100 | } | ||
| 99 | 101 | ||
| 100 | fprs = fprs_read(); | 102 | fprs = fprs_read(); |
| 101 | fprs_write(FPRS_FEF); | 103 | fprs_write(FPRS_FEF); |
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S index 6be4d2d2904e..49eca4b1cf25 100644 --- a/arch/sparc64/kernel/entry.S +++ b/arch/sparc64/kernel/entry.S | |||
| @@ -1705,6 +1705,36 @@ __flushw_user: | |||
| 1705 | 2: retl | 1705 | 2: retl |
| 1706 | nop | 1706 | nop |
| 1707 | 1707 | ||
| 1708 | /* Flush %fp and %i7 to the stack for all register | ||
| 1709 | * windows active inside of the cpu. This allows | ||
| 1710 | * show_stack_trace() to avoid using an expensive | ||
| 1711 | * 'flushw'. | ||
| 1712 | */ | ||
| 1713 | .globl stack_trace_flush | ||
| 1714 | .type stack_trace_flush,#function | ||
| 1715 | stack_trace_flush: | ||
| 1716 | rdpr %pstate, %o0 | ||
| 1717 | wrpr %o0, PSTATE_IE, %pstate | ||
| 1718 | |||
| 1719 | rdpr %cwp, %g1 | ||
| 1720 | rdpr %canrestore, %g2 | ||
| 1721 | sub %g1, 1, %g3 | ||
| 1722 | |||
| 1723 | 1: brz,pn %g2, 2f | ||
| 1724 | sub %g2, 1, %g2 | ||
| 1725 | wrpr %g3, %cwp | ||
| 1726 | stx %fp, [%sp + STACK_BIAS + RW_V9_I6] | ||
| 1727 | stx %i7, [%sp + STACK_BIAS + RW_V9_I7] | ||
| 1728 | ba,pt %xcc, 1b | ||
| 1729 | sub %g3, 1, %g3 | ||
| 1730 | |||
| 1731 | 2: wrpr %g1, %cwp | ||
| 1732 | wrpr %o0, %pstate | ||
| 1733 | |||
| 1734 | retl | ||
| 1735 | nop | ||
| 1736 | .size stack_trace_flush,.-stack_trace_flush | ||
| 1737 | |||
| 1708 | #ifdef CONFIG_SMP | 1738 | #ifdef CONFIG_SMP |
| 1709 | .globl hard_smp_processor_id | 1739 | .globl hard_smp_processor_id |
| 1710 | hard_smp_processor_id: | 1740 | hard_smp_processor_id: |
diff --git a/arch/sparc64/kernel/entry.h b/arch/sparc64/kernel/entry.h new file mode 100644 index 000000000000..4a91e9c6d31b --- /dev/null +++ b/arch/sparc64/kernel/entry.h | |||
| @@ -0,0 +1,196 @@ | |||
| 1 | #ifndef _ENTRY_H | ||
| 2 | #define _ENTRY_H | ||
| 3 | |||
| 4 | #include <linux/kernel.h> | ||
| 5 | #include <linux/types.h> | ||
| 6 | #include <linux/init.h> | ||
| 7 | |||
| 8 | extern char *sparc_cpu_type; | ||
| 9 | extern char *sparc_fpu_type; | ||
| 10 | |||
| 11 | extern void __init per_cpu_patch(void); | ||
| 12 | extern void __init sun4v_patch(void); | ||
| 13 | extern void __init boot_cpu_id_too_large(int cpu); | ||
| 14 | extern unsigned int dcache_parity_tl1_occurred; | ||
| 15 | extern unsigned int icache_parity_tl1_occurred; | ||
| 16 | |||
| 17 | extern asmlinkage void update_perfctrs(void); | ||
| 18 | extern asmlinkage void sparc_breakpoint(struct pt_regs *regs); | ||
| 19 | extern void timer_interrupt(int irq, struct pt_regs *regs); | ||
| 20 | |||
| 21 | extern void do_notify_resume(struct pt_regs *regs, | ||
| 22 | unsigned long orig_i0, | ||
| 23 | int restart_syscall, | ||
| 24 | unsigned long thread_info_flags); | ||
| 25 | |||
| 26 | extern asmlinkage void syscall_trace(struct pt_regs *regs, | ||
| 27 | int syscall_exit_p); | ||
| 28 | |||
| 29 | extern void bad_trap_tl1(struct pt_regs *regs, long lvl); | ||
| 30 | |||
| 31 | extern void do_fpe_common(struct pt_regs *regs); | ||
| 32 | extern void do_fpieee(struct pt_regs *regs); | ||
| 33 | extern void do_fpother(struct pt_regs *regs); | ||
| 34 | extern void do_tof(struct pt_regs *regs); | ||
| 35 | extern void do_div0(struct pt_regs *regs); | ||
| 36 | extern void do_illegal_instruction(struct pt_regs *regs); | ||
| 37 | extern void mem_address_unaligned(struct pt_regs *regs, | ||
| 38 | unsigned long sfar, | ||
| 39 | unsigned long sfsr); | ||
| 40 | extern void sun4v_do_mna(struct pt_regs *regs, | ||
| 41 | unsigned long addr, | ||
| 42 | unsigned long type_ctx); | ||
| 43 | extern void do_privop(struct pt_regs *regs); | ||
| 44 | extern void do_privact(struct pt_regs *regs); | ||
| 45 | extern void do_cee(struct pt_regs *regs); | ||
| 46 | extern void do_cee_tl1(struct pt_regs *regs); | ||
| 47 | extern void do_dae_tl1(struct pt_regs *regs); | ||
| 48 | extern void do_iae_tl1(struct pt_regs *regs); | ||
| 49 | extern void do_div0_tl1(struct pt_regs *regs); | ||
| 50 | extern void do_fpdis_tl1(struct pt_regs *regs); | ||
| 51 | extern void do_fpieee_tl1(struct pt_regs *regs); | ||
| 52 | extern void do_fpother_tl1(struct pt_regs *regs); | ||
| 53 | extern void do_ill_tl1(struct pt_regs *regs); | ||
| 54 | extern void do_irq_tl1(struct pt_regs *regs); | ||
| 55 | extern void do_lddfmna_tl1(struct pt_regs *regs); | ||
| 56 | extern void do_stdfmna_tl1(struct pt_regs *regs); | ||
| 57 | extern void do_paw(struct pt_regs *regs); | ||
| 58 | extern void do_paw_tl1(struct pt_regs *regs); | ||
| 59 | extern void do_vaw(struct pt_regs *regs); | ||
| 60 | extern void do_vaw_tl1(struct pt_regs *regs); | ||
| 61 | extern void do_tof_tl1(struct pt_regs *regs); | ||
| 62 | extern void do_getpsr(struct pt_regs *regs); | ||
| 63 | |||
| 64 | extern void spitfire_insn_access_exception(struct pt_regs *regs, | ||
| 65 | unsigned long sfsr, | ||
| 66 | unsigned long sfar); | ||
| 67 | extern void spitfire_insn_access_exception_tl1(struct pt_regs *regs, | ||
| 68 | unsigned long sfsr, | ||
| 69 | unsigned long sfar); | ||
| 70 | extern void spitfire_data_access_exception(struct pt_regs *regs, | ||
| 71 | unsigned long sfsr, | ||
| 72 | unsigned long sfar); | ||
| 73 | extern void spitfire_data_access_exception_tl1(struct pt_regs *regs, | ||
| 74 | unsigned long sfsr, | ||
| 75 | unsigned long sfar); | ||
| 76 | extern void spitfire_access_error(struct pt_regs *regs, | ||
| 77 | unsigned long status_encoded, | ||
| 78 | unsigned long afar); | ||
| 79 | |||
| 80 | extern void cheetah_fecc_handler(struct pt_regs *regs, | ||
| 81 | unsigned long afsr, | ||
| 82 | unsigned long afar); | ||
| 83 | extern void cheetah_cee_handler(struct pt_regs *regs, | ||
| 84 | unsigned long afsr, | ||
| 85 | unsigned long afar); | ||
| 86 | extern void cheetah_deferred_handler(struct pt_regs *regs, | ||
| 87 | unsigned long afsr, | ||
| 88 | unsigned long afar); | ||
| 89 | extern void cheetah_plus_parity_error(int type, struct pt_regs *regs); | ||
| 90 | |||
| 91 | extern void sun4v_insn_access_exception(struct pt_regs *regs, | ||
| 92 | unsigned long addr, | ||
| 93 | unsigned long type_ctx); | ||
| 94 | extern void sun4v_insn_access_exception_tl1(struct pt_regs *regs, | ||
| 95 | unsigned long addr, | ||
| 96 | unsigned long type_ctx); | ||
| 97 | extern void sun4v_data_access_exception(struct pt_regs *regs, | ||
| 98 | unsigned long addr, | ||
| 99 | unsigned long type_ctx); | ||
| 100 | extern void sun4v_data_access_exception_tl1(struct pt_regs *regs, | ||
| 101 | unsigned long addr, | ||
| 102 | unsigned long type_ctx); | ||
| 103 | extern void sun4v_resum_error(struct pt_regs *regs, | ||
| 104 | unsigned long offset); | ||
| 105 | extern void sun4v_resum_overflow(struct pt_regs *regs); | ||
| 106 | extern void sun4v_nonresum_error(struct pt_regs *regs, | ||
| 107 | unsigned long offset); | ||
| 108 | extern void sun4v_nonresum_overflow(struct pt_regs *regs); | ||
| 109 | |||
| 110 | extern unsigned long sun4v_err_itlb_vaddr; | ||
| 111 | extern unsigned long sun4v_err_itlb_ctx; | ||
| 112 | extern unsigned long sun4v_err_itlb_pte; | ||
| 113 | extern unsigned long sun4v_err_itlb_error; | ||
| 114 | |||
| 115 | extern void sun4v_itlb_error_report(struct pt_regs *regs, int tl); | ||
| 116 | |||
| 117 | extern unsigned long sun4v_err_dtlb_vaddr; | ||
| 118 | extern unsigned long sun4v_err_dtlb_ctx; | ||
| 119 | extern unsigned long sun4v_err_dtlb_pte; | ||
| 120 | extern unsigned long sun4v_err_dtlb_error; | ||
| 121 | |||
| 122 | extern void sun4v_dtlb_error_report(struct pt_regs *regs, int tl); | ||
| 123 | extern void hypervisor_tlbop_error(unsigned long err, | ||
| 124 | unsigned long op); | ||
| 125 | extern void hypervisor_tlbop_error_xcall(unsigned long err, | ||
| 126 | unsigned long op); | ||
| 127 | |||
| 128 | /* WARNING: The error trap handlers in assembly know the precise | ||
| 129 | * layout of the following structure. | ||
| 130 | * | ||
| 131 | * C-level handlers in traps.c use this information to log the | ||
| 132 | * error and then determine how to recover (if possible). | ||
| 133 | */ | ||
| 134 | struct cheetah_err_info { | ||
| 135 | /*0x00*/u64 afsr; | ||
| 136 | /*0x08*/u64 afar; | ||
| 137 | |||
| 138 | /* D-cache state */ | ||
| 139 | /*0x10*/u64 dcache_data[4]; /* The actual data */ | ||
| 140 | /*0x30*/u64 dcache_index; /* D-cache index */ | ||
| 141 | /*0x38*/u64 dcache_tag; /* D-cache tag/valid */ | ||
| 142 | /*0x40*/u64 dcache_utag; /* D-cache microtag */ | ||
| 143 | /*0x48*/u64 dcache_stag; /* D-cache snooptag */ | ||
| 144 | |||
| 145 | /* I-cache state */ | ||
| 146 | /*0x50*/u64 icache_data[8]; /* The actual insns + predecode */ | ||
| 147 | /*0x90*/u64 icache_index; /* I-cache index */ | ||
| 148 | /*0x98*/u64 icache_tag; /* I-cache phys tag */ | ||
| 149 | /*0xa0*/u64 icache_utag; /* I-cache microtag */ | ||
| 150 | /*0xa8*/u64 icache_stag; /* I-cache snooptag */ | ||
| 151 | /*0xb0*/u64 icache_upper; /* I-cache upper-tag */ | ||
| 152 | /*0xb8*/u64 icache_lower; /* I-cache lower-tag */ | ||
| 153 | |||
| 154 | /* E-cache state */ | ||
| 155 | /*0xc0*/u64 ecache_data[4]; /* 32 bytes from staging registers */ | ||
| 156 | /*0xe0*/u64 ecache_index; /* E-cache index */ | ||
| 157 | /*0xe8*/u64 ecache_tag; /* E-cache tag/state */ | ||
| 158 | |||
| 159 | /*0xf0*/u64 __pad[32 - 30]; | ||
| 160 | }; | ||
| 161 | #define CHAFSR_INVALID ((u64)-1L) | ||
| 162 | |||
| 163 | /* This is allocated at boot time based upon the largest hardware | ||
| 164 | * cpu ID in the system. We allocate two entries per cpu, one for | ||
| 165 | * TL==0 logging and one for TL >= 1 logging. | ||
| 166 | */ | ||
| 167 | extern struct cheetah_err_info *cheetah_error_log; | ||
| 168 | |||
| 169 | /* UPA nodes send interrupt packet to UltraSparc with first data reg | ||
| 170 | * value low 5 (7 on Starfire) bits holding the IRQ identifier being | ||
| 171 | * delivered. We must translate this into a non-vector IRQ so we can | ||
| 172 | * set the softint on this cpu. | ||
| 173 | * | ||
| 174 | * To make processing these packets efficient and race free we use | ||
| 175 | * an array of irq buckets below. The interrupt vector handler in | ||
| 176 | * entry.S feeds incoming packets into per-cpu pil-indexed lists. | ||
| 177 | * | ||
| 178 | * If you make changes to ino_bucket, please update hand coded assembler | ||
| 179 | * of the vectored interrupt trap handler(s) in entry.S and sun4v_ivec.S | ||
| 180 | */ | ||
| 181 | struct ino_bucket { | ||
| 182 | /*0x00*/unsigned long __irq_chain_pa; | ||
| 183 | |||
| 184 | /* Virtual interrupt number assigned to this INO. */ | ||
| 185 | /*0x08*/unsigned int __virt_irq; | ||
| 186 | /*0x0c*/unsigned int __pad; | ||
| 187 | }; | ||
| 188 | |||
| 189 | extern struct ino_bucket *ivector_table; | ||
| 190 | extern unsigned long ivector_table_pa; | ||
| 191 | |||
| 192 | extern void handler_irq(int irq, struct pt_regs *regs); | ||
| 193 | extern void init_irqwork_curcpu(void); | ||
| 194 | extern void __cpuinit sun4v_register_mondo_queues(int this_cpu); | ||
| 195 | |||
| 196 | #endif /* _ENTRY_H */ | ||
diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c index fbaab3497bfd..b781d3d54fb8 100644 --- a/arch/sparc64/kernel/iommu.c +++ b/arch/sparc64/kernel/iommu.c | |||
| @@ -626,7 +626,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist, | |||
| 626 | iommu_map_failed: | 626 | iommu_map_failed: |
| 627 | for_each_sg(sglist, s, nelems, i) { | 627 | for_each_sg(sglist, s, nelems, i) { |
| 628 | if (s->dma_length != 0) { | 628 | if (s->dma_length != 0) { |
| 629 | unsigned long vaddr, npages, entry, i; | 629 | unsigned long vaddr, npages, entry, j; |
| 630 | iopte_t *base; | 630 | iopte_t *base; |
| 631 | 631 | ||
| 632 | vaddr = s->dma_address & IO_PAGE_MASK; | 632 | vaddr = s->dma_address & IO_PAGE_MASK; |
| @@ -637,8 +637,8 @@ iommu_map_failed: | |||
| 637 | >> IO_PAGE_SHIFT; | 637 | >> IO_PAGE_SHIFT; |
| 638 | base = iommu->page_table + entry; | 638 | base = iommu->page_table + entry; |
| 639 | 639 | ||
| 640 | for (i = 0; i < npages; i++) | 640 | for (j = 0; j < npages; j++) |
| 641 | iopte_make_dummy(iommu, base + i); | 641 | iopte_make_dummy(iommu, base + j); |
| 642 | 642 | ||
| 643 | s->dma_address = DMA_ERROR_CODE; | 643 | s->dma_address = DMA_ERROR_CODE; |
| 644 | s->dma_length = 0; | 644 | s->dma_length = 0; |
| @@ -803,7 +803,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev, | |||
| 803 | spin_unlock_irqrestore(&iommu->lock, flags); | 803 | spin_unlock_irqrestore(&iommu->lock, flags); |
| 804 | } | 804 | } |
| 805 | 805 | ||
| 806 | const struct dma_ops sun4u_dma_ops = { | 806 | static const struct dma_ops sun4u_dma_ops = { |
| 807 | .alloc_coherent = dma_4u_alloc_coherent, | 807 | .alloc_coherent = dma_4u_alloc_coherent, |
| 808 | .free_coherent = dma_4u_free_coherent, | 808 | .free_coherent = dma_4u_free_coherent, |
| 809 | .map_single = dma_4u_map_single, | 809 | .map_single = dma_4u_map_single, |
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index 5ec06c8c7fea..eb88bd6e674e 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c | |||
| @@ -44,27 +44,10 @@ | |||
| 44 | #include <asm/hypervisor.h> | 44 | #include <asm/hypervisor.h> |
| 45 | #include <asm/cacheflush.h> | 45 | #include <asm/cacheflush.h> |
| 46 | 46 | ||
| 47 | /* UPA nodes send interrupt packet to UltraSparc with first data reg | 47 | #include "entry.h" |
| 48 | * value low 5 (7 on Starfire) bits holding the IRQ identifier being | ||
| 49 | * delivered. We must translate this into a non-vector IRQ so we can | ||
| 50 | * set the softint on this cpu. | ||
| 51 | * | ||
| 52 | * To make processing these packets efficient and race free we use | ||
| 53 | * an array of irq buckets below. The interrupt vector handler in | ||
| 54 | * entry.S feeds incoming packets into per-cpu pil-indexed lists. | ||
| 55 | * | ||
| 56 | * If you make changes to ino_bucket, please update hand coded assembler | ||
| 57 | * of the vectored interrupt trap handler(s) in entry.S and sun4v_ivec.S | ||
| 58 | */ | ||
| 59 | struct ino_bucket { | ||
| 60 | /*0x00*/unsigned long __irq_chain_pa; | ||
| 61 | |||
| 62 | /* Virtual interrupt number assigned to this INO. */ | ||
| 63 | /*0x08*/unsigned int __virt_irq; | ||
| 64 | /*0x0c*/unsigned int __pad; | ||
| 65 | }; | ||
| 66 | 48 | ||
| 67 | #define NUM_IVECS (IMAP_INR + 1) | 49 | #define NUM_IVECS (IMAP_INR + 1) |
| 50 | |||
| 68 | struct ino_bucket *ivector_table; | 51 | struct ino_bucket *ivector_table; |
| 69 | unsigned long ivector_table_pa; | 52 | unsigned long ivector_table_pa; |
| 70 | 53 | ||
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index 9a1ba1fe859d..aaae865e7932 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c | |||
| @@ -35,6 +35,9 @@ | |||
| 35 | #include <asm/spitfire.h> | 35 | #include <asm/spitfire.h> |
| 36 | #include <asm/page.h> | 36 | #include <asm/page.h> |
| 37 | #include <asm/cpudata.h> | 37 | #include <asm/cpudata.h> |
| 38 | #include <asm/cacheflush.h> | ||
| 39 | |||
| 40 | #include "entry.h" | ||
| 38 | 41 | ||
| 39 | /* #define ALLOW_INIT_TRACING */ | 42 | /* #define ALLOW_INIT_TRACING */ |
| 40 | 43 | ||
| @@ -67,6 +70,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page, | |||
| 67 | if (tlb_type == hypervisor) | 70 | if (tlb_type == hypervisor) |
| 68 | return; | 71 | return; |
| 69 | 72 | ||
| 73 | preempt_disable(); | ||
| 74 | |||
| 70 | #ifdef DCACHE_ALIASING_POSSIBLE | 75 | #ifdef DCACHE_ALIASING_POSSIBLE |
| 71 | /* If bit 13 of the kernel address we used to access the | 76 | /* If bit 13 of the kernel address we used to access the |
| 72 | * user page is the same as the virtual address that page | 77 | * user page is the same as the virtual address that page |
| @@ -105,6 +110,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page, | |||
| 105 | for (; start < end; start += icache_line_size) | 110 | for (; start < end; start += icache_line_size) |
| 106 | flushi(start); | 111 | flushi(start); |
| 107 | } | 112 | } |
| 113 | |||
| 114 | preempt_enable(); | ||
| 108 | } | 115 | } |
| 109 | 116 | ||
| 110 | enum sparc_regset { | 117 | enum sparc_regset { |
| @@ -382,6 +389,7 @@ static const struct user_regset_view user_sparc64_view = { | |||
| 382 | .regsets = sparc64_regsets, .n = ARRAY_SIZE(sparc64_regsets) | 389 | .regsets = sparc64_regsets, .n = ARRAY_SIZE(sparc64_regsets) |
| 383 | }; | 390 | }; |
| 384 | 391 | ||
| 392 | #ifdef CONFIG_COMPAT | ||
| 385 | static int genregs32_get(struct task_struct *target, | 393 | static int genregs32_get(struct task_struct *target, |
| 386 | const struct user_regset *regset, | 394 | const struct user_regset *regset, |
| 387 | unsigned int pos, unsigned int count, | 395 | unsigned int pos, unsigned int count, |
| @@ -676,14 +684,18 @@ static const struct user_regset_view user_sparc32_view = { | |||
| 676 | .name = "sparc", .e_machine = EM_SPARC, | 684 | .name = "sparc", .e_machine = EM_SPARC, |
| 677 | .regsets = sparc32_regsets, .n = ARRAY_SIZE(sparc32_regsets) | 685 | .regsets = sparc32_regsets, .n = ARRAY_SIZE(sparc32_regsets) |
| 678 | }; | 686 | }; |
| 687 | #endif /* CONFIG_COMPAT */ | ||
| 679 | 688 | ||
| 680 | const struct user_regset_view *task_user_regset_view(struct task_struct *task) | 689 | const struct user_regset_view *task_user_regset_view(struct task_struct *task) |
| 681 | { | 690 | { |
| 691 | #ifdef CONFIG_COMPAT | ||
| 682 | if (test_tsk_thread_flag(task, TIF_32BIT)) | 692 | if (test_tsk_thread_flag(task, TIF_32BIT)) |
| 683 | return &user_sparc32_view; | 693 | return &user_sparc32_view; |
| 694 | #endif | ||
| 684 | return &user_sparc64_view; | 695 | return &user_sparc64_view; |
| 685 | } | 696 | } |
| 686 | 697 | ||
| 698 | #ifdef CONFIG_COMPAT | ||
| 687 | struct compat_fps { | 699 | struct compat_fps { |
| 688 | unsigned int regs[32]; | 700 | unsigned int regs[32]; |
| 689 | unsigned int fsr; | 701 | unsigned int fsr; |
| @@ -798,6 +810,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | |||
| 798 | 810 | ||
| 799 | return ret; | 811 | return ret; |
| 800 | } | 812 | } |
| 813 | #endif /* CONFIG_COMPAT */ | ||
| 801 | 814 | ||
| 802 | struct fps { | 815 | struct fps { |
| 803 | unsigned int regs[64]; | 816 | unsigned int regs[64]; |
| @@ -807,11 +820,14 @@ struct fps { | |||
| 807 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 820 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
| 808 | { | 821 | { |
| 809 | const struct user_regset_view *view = task_user_regset_view(child); | 822 | const struct user_regset_view *view = task_user_regset_view(child); |
| 810 | struct pt_regs __user *pregs = (struct pt_regs __user *) addr; | ||
| 811 | unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4]; | 823 | unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4]; |
| 812 | struct fps __user *fps = (struct fps __user *) addr; | 824 | struct pt_regs __user *pregs; |
| 825 | struct fps __user *fps; | ||
| 813 | int ret; | 826 | int ret; |
| 814 | 827 | ||
| 828 | pregs = (struct pt_regs __user *) (unsigned long) addr; | ||
| 829 | fps = (struct fps __user *) (unsigned long) addr; | ||
| 830 | |||
| 815 | switch (request) { | 831 | switch (request) { |
| 816 | case PTRACE_PEEKUSR: | 832 | case PTRACE_PEEKUSR: |
| 817 | ret = (addr != 0) ? -EIO : 0; | 833 | ret = (addr != 0) ? -EIO : 0; |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index d036dbe72864..6acb4c51cfe4 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
| @@ -51,6 +51,8 @@ | |||
| 51 | #include <net/ipconfig.h> | 51 | #include <net/ipconfig.h> |
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | #include "entry.h" | ||
| 55 | |||
| 54 | /* Used to synchronize accesses to NatSemi SUPER I/O chip configure | 56 | /* Used to synchronize accesses to NatSemi SUPER I/O chip configure |
| 55 | * operations in asm/ns87303.h | 57 | * operations in asm/ns87303.h |
| 56 | */ | 58 | */ |
| @@ -335,9 +337,6 @@ void __init setup_arch(char **cmdline_p) | |||
| 335 | 337 | ||
| 336 | /* BUFFER is PAGE_SIZE bytes long. */ | 338 | /* BUFFER is PAGE_SIZE bytes long. */ |
| 337 | 339 | ||
| 338 | extern char *sparc_cpu_type; | ||
| 339 | extern char *sparc_fpu_type; | ||
| 340 | |||
| 341 | extern void smp_info(struct seq_file *); | 340 | extern void smp_info(struct seq_file *); |
| 342 | extern void smp_bogo(struct seq_file *); | 341 | extern void smp_bogo(struct seq_file *); |
| 343 | extern void mmu_info(struct seq_file *); | 342 | extern void mmu_info(struct seq_file *); |
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index fb13775b3682..94a9d64208ee 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
| @@ -32,6 +32,9 @@ | |||
| 32 | #include <asm/siginfo.h> | 32 | #include <asm/siginfo.h> |
| 33 | #include <asm/visasm.h> | 33 | #include <asm/visasm.h> |
| 34 | 34 | ||
| 35 | #include "entry.h" | ||
| 36 | #include "systbls.h" | ||
| 37 | |||
| 35 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | 38 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) |
| 36 | 39 | ||
| 37 | /* {set, get}context() needed for 64-bit SparcLinux userland. */ | 40 | /* {set, get}context() needed for 64-bit SparcLinux userland. */ |
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 5a1126b363a4..59f020d69d4c 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* smp.c: Sparc64 SMP support. | 1 | /* smp.c: Sparc64 SMP support. |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 1997, 2007 David S. Miller (davem@davemloft.net) | 3 | * Copyright (C) 1997, 2007, 2008 David S. Miller (davem@davemloft.net) |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <asm/cpudata.h> | 30 | #include <asm/cpudata.h> |
| 31 | #include <asm/hvtramp.h> | 31 | #include <asm/hvtramp.h> |
| 32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
| 33 | #include <asm/timer.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 35 | #include <asm/irq_regs.h> | 36 | #include <asm/irq_regs.h> |
diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c index 47f92a59be18..84d39e873e88 100644 --- a/arch/sparc64/kernel/stacktrace.c +++ b/arch/sparc64/kernel/stacktrace.c | |||
| @@ -2,13 +2,15 @@ | |||
| 2 | #include <linux/stacktrace.h> | 2 | #include <linux/stacktrace.h> |
| 3 | #include <linux/thread_info.h> | 3 | #include <linux/thread_info.h> |
| 4 | #include <asm/ptrace.h> | 4 | #include <asm/ptrace.h> |
| 5 | #include <asm/stacktrace.h> | ||
| 5 | 6 | ||
| 6 | void save_stack_trace(struct stack_trace *trace) | 7 | void save_stack_trace(struct stack_trace *trace) |
| 7 | { | 8 | { |
| 8 | unsigned long ksp, fp, thread_base; | 9 | unsigned long ksp, fp, thread_base; |
| 9 | struct thread_info *tp = task_thread_info(current); | 10 | struct thread_info *tp = task_thread_info(current); |
| 10 | 11 | ||
| 11 | flushw_all(); | 12 | stack_trace_flush(); |
| 13 | |||
| 12 | __asm__ __volatile__( | 14 | __asm__ __volatile__( |
| 13 | "mov %%fp, %0" | 15 | "mov %%fp, %0" |
| 14 | : "=r" (ksp) | 16 | : "=r" (ksp) |
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index 134d801579f9..f952745d0f3d 100644 --- a/arch/sparc64/kernel/sys_sparc.c +++ b/arch/sparc64/kernel/sys_sparc.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | /* $Id: sys_sparc.c,v 1.57 2002/02/09 19:49:30 davem Exp $ | 1 | /* linux/arch/sparc64/kernel/sys_sparc.c |
| 2 | * linux/arch/sparc64/kernel/sys_sparc.c | ||
| 3 | * | 2 | * |
| 4 | * This file contains various random system calls that | 3 | * This file contains various random system calls that |
| 5 | * have a non-standard calling sequence on the Linux/sparc | 4 | * have a non-standard calling sequence on the Linux/sparc |
| @@ -30,6 +29,9 @@ | |||
| 30 | #include <asm/perfctr.h> | 29 | #include <asm/perfctr.h> |
| 31 | #include <asm/unistd.h> | 30 | #include <asm/unistd.h> |
| 32 | 31 | ||
| 32 | #include "entry.h" | ||
| 33 | #include "systbls.h" | ||
| 34 | |||
| 33 | /* #define DEBUG_UNIMP_SYSCALL */ | 35 | /* #define DEBUG_UNIMP_SYSCALL */ |
| 34 | 36 | ||
| 35 | asmlinkage unsigned long sys_getpagesize(void) | 37 | asmlinkage unsigned long sys_getpagesize(void) |
| @@ -445,7 +447,8 @@ asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second, | |||
| 445 | goto out; | 447 | goto out; |
| 446 | case SEMTIMEDOP: | 448 | case SEMTIMEDOP: |
| 447 | err = sys_semtimedop(first, ptr, (unsigned)second, | 449 | err = sys_semtimedop(first, ptr, (unsigned)second, |
| 448 | (const struct timespec __user *) fifth); | 450 | (const struct timespec __user *) |
| 451 | (unsigned long) fifth); | ||
| 449 | goto out; | 452 | goto out; |
| 450 | case SEMGET: | 453 | case SEMGET: |
| 451 | err = sys_semget(first, (int)second, (int)third); | 454 | err = sys_semget(first, (int)second, (int)third); |
| @@ -788,7 +791,7 @@ asmlinkage long sys_utrap_install(utrap_entry_t type, | |||
| 788 | } else { | 791 | } else { |
| 789 | if ((utrap_handler_t)current_thread_info()->utraps[type] != new_p && | 792 | if ((utrap_handler_t)current_thread_info()->utraps[type] != new_p && |
| 790 | current_thread_info()->utraps[0] > 1) { | 793 | current_thread_info()->utraps[0] > 1) { |
| 791 | long *p = current_thread_info()->utraps; | 794 | unsigned long *p = current_thread_info()->utraps; |
| 792 | 795 | ||
| 793 | current_thread_info()->utraps = | 796 | current_thread_info()->utraps = |
| 794 | kmalloc((UT_TRAP_INSTRUCTION_31+1)*sizeof(long), | 797 | kmalloc((UT_TRAP_INSTRUCTION_31+1)*sizeof(long), |
| @@ -816,7 +819,8 @@ asmlinkage long sys_utrap_install(utrap_entry_t type, | |||
| 816 | return 0; | 819 | return 0; |
| 817 | } | 820 | } |
| 818 | 821 | ||
| 819 | long sparc_memory_ordering(unsigned long model, struct pt_regs *regs) | 822 | asmlinkage long sparc_memory_ordering(unsigned long model, |
| 823 | struct pt_regs *regs) | ||
| 820 | { | 824 | { |
| 821 | if (model >= 3) | 825 | if (model >= 3) |
| 822 | return -EINVAL; | 826 | return -EINVAL; |
diff --git a/arch/sparc64/kernel/systbls.h b/arch/sparc64/kernel/systbls.h new file mode 100644 index 000000000000..8a0d20a35d0c --- /dev/null +++ b/arch/sparc64/kernel/systbls.h | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | #ifndef _SYSTBLS_H | ||
| 2 | #define _SYSTBLS_H | ||
| 3 | |||
| 4 | #include <linux/kernel.h> | ||
| 5 | #include <linux/types.h> | ||
| 6 | #include <linux/utsname.h> | ||
| 7 | #include <asm/utrap.h> | ||
| 8 | #include <asm/signal.h> | ||
| 9 | |||
| 10 | extern asmlinkage unsigned long sys_getpagesize(void); | ||
| 11 | extern asmlinkage unsigned long sparc_brk(unsigned long brk); | ||
| 12 | extern asmlinkage long sparc_pipe(struct pt_regs *regs); | ||
| 13 | extern asmlinkage long sys_ipc(unsigned int call, int first, | ||
| 14 | unsigned long second, | ||
| 15 | unsigned long third, | ||
| 16 | void __user *ptr, long fifth); | ||
| 17 | extern asmlinkage long sparc64_newuname(struct new_utsname __user *name); | ||
| 18 | extern asmlinkage long sparc64_personality(unsigned long personality); | ||
| 19 | extern asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len, | ||
| 20 | unsigned long prot, unsigned long flags, | ||
| 21 | unsigned long fd, unsigned long off); | ||
| 22 | extern asmlinkage long sys64_munmap(unsigned long addr, size_t len); | ||
| 23 | extern asmlinkage unsigned long sys64_mremap(unsigned long addr, | ||
| 24 | unsigned long old_len, | ||
| 25 | unsigned long new_len, | ||
| 26 | unsigned long flags, | ||
| 27 | unsigned long new_addr); | ||
| 28 | extern asmlinkage unsigned long c_sys_nis_syscall(struct pt_regs *regs); | ||
| 29 | extern asmlinkage long sys_getdomainname(char __user *name, int len); | ||
| 30 | extern asmlinkage long solaris_syscall(struct pt_regs *regs); | ||
| 31 | extern asmlinkage long sunos_syscall(struct pt_regs *regs); | ||
| 32 | extern asmlinkage long sys_utrap_install(utrap_entry_t type, | ||
| 33 | utrap_handler_t new_p, | ||
| 34 | utrap_handler_t new_d, | ||
| 35 | utrap_handler_t __user *old_p, | ||
| 36 | utrap_handler_t __user *old_d); | ||
| 37 | extern asmlinkage long sparc_memory_ordering(unsigned long model, | ||
| 38 | struct pt_regs *regs); | ||
| 39 | extern asmlinkage long sys_rt_sigaction(int sig, | ||
| 40 | const struct sigaction __user *act, | ||
| 41 | struct sigaction __user *oact, | ||
| 42 | void __user *restorer, | ||
| 43 | size_t sigsetsize); | ||
| 44 | extern asmlinkage long sys_perfctr(int opcode, unsigned long arg0, | ||
| 45 | unsigned long arg1, unsigned long arg2); | ||
| 46 | |||
| 47 | extern asmlinkage void sparc64_set_context(struct pt_regs *regs); | ||
| 48 | extern asmlinkage void sparc64_get_context(struct pt_regs *regs); | ||
| 49 | extern asmlinkage long sys_sigpause(unsigned int set); | ||
| 50 | extern asmlinkage long sys_sigsuspend(old_sigset_t set); | ||
| 51 | extern void do_rt_sigreturn(struct pt_regs *regs); | ||
| 52 | |||
| 53 | #endif /* _SYSTBLS_H */ | ||
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index d204f1ab1d4c..e5d238970c7e 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* $Id: time.c,v 1.42 2002/01/23 14:33:55 davem Exp $ | 1 | /* time.c: UltraSparc timer and TOD clock support. |
| 2 | * time.c: UltraSparc timer and TOD clock support. | ||
| 3 | * | 2 | * |
| 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1997, 2008 David S. Miller (davem@davemloft.net) |
| 5 | * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) |
| 6 | * | 5 | * |
| 7 | * Based largely on code which is: | 6 | * Based largely on code which is: |
| @@ -48,6 +47,8 @@ | |||
| 48 | #include <asm/uaccess.h> | 47 | #include <asm/uaccess.h> |
| 49 | #include <asm/irq_regs.h> | 48 | #include <asm/irq_regs.h> |
| 50 | 49 | ||
| 50 | #include "entry.h" | ||
| 51 | |||
| 51 | DEFINE_SPINLOCK(mostek_lock); | 52 | DEFINE_SPINLOCK(mostek_lock); |
| 52 | DEFINE_SPINLOCK(rtc_lock); | 53 | DEFINE_SPINLOCK(rtc_lock); |
| 53 | void __iomem *mstk48t02_regs = NULL; | 54 | void __iomem *mstk48t02_regs = NULL; |
| @@ -508,6 +509,37 @@ static int __init has_low_battery(void) | |||
| 508 | return (data1 == data2); /* Was the write blocked? */ | 509 | return (data1 == data2); /* Was the write blocked? */ |
| 509 | } | 510 | } |
| 510 | 511 | ||
| 512 | static void __init mostek_set_system_time(void __iomem *mregs) | ||
| 513 | { | ||
| 514 | unsigned int year, mon, day, hour, min, sec; | ||
| 515 | u8 tmp; | ||
| 516 | |||
| 517 | spin_lock_irq(&mostek_lock); | ||
| 518 | |||
| 519 | /* Traditional Mostek chip. */ | ||
| 520 | tmp = mostek_read(mregs + MOSTEK_CREG); | ||
| 521 | tmp |= MSTK_CREG_READ; | ||
| 522 | mostek_write(mregs + MOSTEK_CREG, tmp); | ||
| 523 | |||
| 524 | sec = MSTK_REG_SEC(mregs); | ||
| 525 | min = MSTK_REG_MIN(mregs); | ||
| 526 | hour = MSTK_REG_HOUR(mregs); | ||
| 527 | day = MSTK_REG_DOM(mregs); | ||
| 528 | mon = MSTK_REG_MONTH(mregs); | ||
| 529 | year = MSTK_CVT_YEAR( MSTK_REG_YEAR(mregs) ); | ||
| 530 | |||
| 531 | xtime.tv_sec = mktime(year, mon, day, hour, min, sec); | ||
| 532 | xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); | ||
| 533 | set_normalized_timespec(&wall_to_monotonic, | ||
| 534 | -xtime.tv_sec, -xtime.tv_nsec); | ||
| 535 | |||
| 536 | tmp = mostek_read(mregs + MOSTEK_CREG); | ||
| 537 | tmp &= ~MSTK_CREG_READ; | ||
| 538 | mostek_write(mregs + MOSTEK_CREG, tmp); | ||
| 539 | |||
| 540 | spin_unlock_irq(&mostek_lock); | ||
| 541 | } | ||
| 542 | |||
| 511 | /* Probe for the real time clock chip. */ | 543 | /* Probe for the real time clock chip. */ |
| 512 | static void __init set_system_time(void) | 544 | static void __init set_system_time(void) |
| 513 | { | 545 | { |
| @@ -520,7 +552,6 @@ static void __init set_system_time(void) | |||
| 520 | unsigned long dregs = 0UL; | 552 | unsigned long dregs = 0UL; |
| 521 | void __iomem *bregs = 0UL; | 553 | void __iomem *bregs = 0UL; |
| 522 | #endif | 554 | #endif |
| 523 | u8 tmp; | ||
| 524 | 555 | ||
| 525 | if (!mregs && !dregs && !bregs) { | 556 | if (!mregs && !dregs && !bregs) { |
| 526 | prom_printf("Something wrong, clock regs not mapped yet.\n"); | 557 | prom_printf("Something wrong, clock regs not mapped yet.\n"); |
| @@ -528,20 +559,11 @@ static void __init set_system_time(void) | |||
| 528 | } | 559 | } |
| 529 | 560 | ||
| 530 | if (mregs) { | 561 | if (mregs) { |
| 531 | spin_lock_irq(&mostek_lock); | 562 | mostek_set_system_time(mregs); |
| 532 | 563 | return; | |
| 533 | /* Traditional Mostek chip. */ | 564 | } |
| 534 | tmp = mostek_read(mregs + MOSTEK_CREG); | ||
| 535 | tmp |= MSTK_CREG_READ; | ||
| 536 | mostek_write(mregs + MOSTEK_CREG, tmp); | ||
| 537 | 565 | ||
| 538 | sec = MSTK_REG_SEC(mregs); | 566 | if (bregs) { |
| 539 | min = MSTK_REG_MIN(mregs); | ||
| 540 | hour = MSTK_REG_HOUR(mregs); | ||
| 541 | day = MSTK_REG_DOM(mregs); | ||
| 542 | mon = MSTK_REG_MONTH(mregs); | ||
| 543 | year = MSTK_CVT_YEAR( MSTK_REG_YEAR(mregs) ); | ||
| 544 | } else if (bregs) { | ||
| 545 | unsigned char val = readb(bregs + 0x0e); | 567 | unsigned char val = readb(bregs + 0x0e); |
| 546 | unsigned int century; | 568 | unsigned int century; |
| 547 | 569 | ||
| @@ -596,14 +618,6 @@ static void __init set_system_time(void) | |||
| 596 | xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); | 618 | xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); |
| 597 | set_normalized_timespec(&wall_to_monotonic, | 619 | set_normalized_timespec(&wall_to_monotonic, |
| 598 | -xtime.tv_sec, -xtime.tv_nsec); | 620 | -xtime.tv_sec, -xtime.tv_nsec); |
| 599 | |||
| 600 | if (mregs) { | ||
| 601 | tmp = mostek_read(mregs + MOSTEK_CREG); | ||
| 602 | tmp &= ~MSTK_CREG_READ; | ||
| 603 | mostek_write(mregs + MOSTEK_CREG, tmp); | ||
| 604 | |||
| 605 | spin_unlock_irq(&mostek_lock); | ||
| 606 | } | ||
| 607 | } | 621 | } |
| 608 | 622 | ||
| 609 | /* davem suggests we keep this within the 4M locked kernel image */ | 623 | /* davem suggests we keep this within the 4M locked kernel image */ |
| @@ -1027,7 +1041,7 @@ void __init time_init(void) | |||
| 1027 | setup_clockevent_multiplier(clock); | 1041 | setup_clockevent_multiplier(clock); |
| 1028 | 1042 | ||
| 1029 | sparc64_clockevent.max_delta_ns = | 1043 | sparc64_clockevent.max_delta_ns = |
| 1030 | clockevent_delta2ns(0x7fffffffffffffff, &sparc64_clockevent); | 1044 | clockevent_delta2ns(0x7fffffffffffffffUL, &sparc64_clockevent); |
| 1031 | sparc64_clockevent.min_delta_ns = | 1045 | sparc64_clockevent.min_delta_ns = |
| 1032 | clockevent_delta2ns(0xF, &sparc64_clockevent); | 1046 | clockevent_delta2ns(0xF, &sparc64_clockevent); |
| 1033 | 1047 | ||
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index 007f5317c0de..96da847023f3 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #endif | 42 | #endif |
| 43 | #include <asm/prom.h> | 43 | #include <asm/prom.h> |
| 44 | 44 | ||
| 45 | #include "entry.h" | ||
| 45 | 46 | ||
| 46 | /* When an irrecoverable trap occurs at tl > 0, the trap entry | 47 | /* When an irrecoverable trap occurs at tl > 0, the trap entry |
| 47 | * code logs the trap state registers at every level in the trap | 48 | * code logs the trap state registers at every level in the trap |
| @@ -77,11 +78,6 @@ static void dump_tl1_traplog(struct tl1_traplog *p) | |||
| 77 | } | 78 | } |
| 78 | } | 79 | } |
| 79 | 80 | ||
| 80 | void do_call_debug(struct pt_regs *regs) | ||
| 81 | { | ||
| 82 | notify_die(DIE_CALL, "debug call", regs, 0, 255, SIGINT); | ||
| 83 | } | ||
| 84 | |||
| 85 | void bad_trap(struct pt_regs *regs, long lvl) | 81 | void bad_trap(struct pt_regs *regs, long lvl) |
| 86 | { | 82 | { |
| 87 | char buffer[32]; | 83 | char buffer[32]; |
| @@ -550,41 +546,6 @@ static unsigned long ecache_flush_physbase; | |||
| 550 | static unsigned long ecache_flush_linesize; | 546 | static unsigned long ecache_flush_linesize; |
| 551 | static unsigned long ecache_flush_size; | 547 | static unsigned long ecache_flush_size; |
| 552 | 548 | ||
| 553 | /* WARNING: The error trap handlers in assembly know the precise | ||
| 554 | * layout of the following structure. | ||
| 555 | * | ||
| 556 | * C-level handlers below use this information to log the error | ||
| 557 | * and then determine how to recover (if possible). | ||
| 558 | */ | ||
| 559 | struct cheetah_err_info { | ||
| 560 | /*0x00*/u64 afsr; | ||
| 561 | /*0x08*/u64 afar; | ||
| 562 | |||
| 563 | /* D-cache state */ | ||
| 564 | /*0x10*/u64 dcache_data[4]; /* The actual data */ | ||
| 565 | /*0x30*/u64 dcache_index; /* D-cache index */ | ||
| 566 | /*0x38*/u64 dcache_tag; /* D-cache tag/valid */ | ||
| 567 | /*0x40*/u64 dcache_utag; /* D-cache microtag */ | ||
| 568 | /*0x48*/u64 dcache_stag; /* D-cache snooptag */ | ||
| 569 | |||
| 570 | /* I-cache state */ | ||
| 571 | /*0x50*/u64 icache_data[8]; /* The actual insns + predecode */ | ||
| 572 | /*0x90*/u64 icache_index; /* I-cache index */ | ||
| 573 | /*0x98*/u64 icache_tag; /* I-cache phys tag */ | ||
| 574 | /*0xa0*/u64 icache_utag; /* I-cache microtag */ | ||
| 575 | /*0xa8*/u64 icache_stag; /* I-cache snooptag */ | ||
| 576 | /*0xb0*/u64 icache_upper; /* I-cache upper-tag */ | ||
| 577 | /*0xb8*/u64 icache_lower; /* I-cache lower-tag */ | ||
| 578 | |||
| 579 | /* E-cache state */ | ||
| 580 | /*0xc0*/u64 ecache_data[4]; /* 32 bytes from staging registers */ | ||
| 581 | /*0xe0*/u64 ecache_index; /* E-cache index */ | ||
| 582 | /*0xe8*/u64 ecache_tag; /* E-cache tag/state */ | ||
| 583 | |||
| 584 | /*0xf0*/u64 __pad[32 - 30]; | ||
| 585 | }; | ||
| 586 | #define CHAFSR_INVALID ((u64)-1L) | ||
| 587 | |||
| 588 | /* This table is ordered in priority of errors and matches the | 549 | /* This table is ordered in priority of errors and matches the |
| 589 | * AFAR overwrite policy as well. | 550 | * AFAR overwrite policy as well. |
| 590 | */ | 551 | */ |
| @@ -758,10 +719,6 @@ static struct afsr_error_table __jalapeno_error_table[] = { | |||
| 758 | static struct afsr_error_table *cheetah_error_table; | 719 | static struct afsr_error_table *cheetah_error_table; |
| 759 | static unsigned long cheetah_afsr_errors; | 720 | static unsigned long cheetah_afsr_errors; |
| 760 | 721 | ||
| 761 | /* This is allocated at boot time based upon the largest hardware | ||
| 762 | * cpu ID in the system. We allocate two entries per cpu, one for | ||
| 763 | * TL==0 logging and one for TL >= 1 logging. | ||
| 764 | */ | ||
| 765 | struct cheetah_err_info *cheetah_error_log; | 722 | struct cheetah_err_info *cheetah_error_log; |
| 766 | 723 | ||
| 767 | static inline struct cheetah_err_info *cheetah_get_error_log(unsigned long afsr) | 724 | static inline struct cheetah_err_info *cheetah_get_error_log(unsigned long afsr) |
| @@ -2102,7 +2059,7 @@ void do_div0(struct pt_regs *regs) | |||
| 2102 | force_sig_info(SIGFPE, &info, current); | 2059 | force_sig_info(SIGFPE, &info, current); |
| 2103 | } | 2060 | } |
| 2104 | 2061 | ||
| 2105 | void instruction_dump (unsigned int *pc) | 2062 | static void instruction_dump(unsigned int *pc) |
| 2106 | { | 2063 | { |
| 2107 | int i; | 2064 | int i; |
| 2108 | 2065 | ||
| @@ -2115,7 +2072,7 @@ void instruction_dump (unsigned int *pc) | |||
| 2115 | printk("\n"); | 2072 | printk("\n"); |
| 2116 | } | 2073 | } |
| 2117 | 2074 | ||
| 2118 | static void user_instruction_dump (unsigned int __user *pc) | 2075 | static void user_instruction_dump(unsigned int __user *pc) |
| 2119 | { | 2076 | { |
| 2120 | int i; | 2077 | int i; |
| 2121 | unsigned int buf[9]; | 2078 | unsigned int buf[9]; |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 466fd6cffac9..f37078d96407 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <asm/prom.h> | 46 | #include <asm/prom.h> |
| 47 | #include <asm/sstate.h> | 47 | #include <asm/sstate.h> |
| 48 | #include <asm/mdesc.h> | 48 | #include <asm/mdesc.h> |
| 49 | #include <asm/cpudata.h> | ||
| 49 | 50 | ||
| 50 | #define MAX_PHYS_ADDRESS (1UL << 42UL) | 51 | #define MAX_PHYS_ADDRESS (1UL << 42UL) |
| 51 | #define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL) | 52 | #define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL) |
| @@ -1273,10 +1274,6 @@ void __cpuinit sun4v_ktsb_register(void) | |||
| 1273 | 1274 | ||
| 1274 | /* paging_init() sets up the page tables */ | 1275 | /* paging_init() sets up the page tables */ |
| 1275 | 1276 | ||
| 1276 | extern void cheetah_ecache_flush_init(void); | ||
| 1277 | extern void sun4v_patch_tlb_handlers(void); | ||
| 1278 | |||
| 1279 | extern void cpu_probe(void); | ||
| 1280 | extern void central_probe(void); | 1277 | extern void central_probe(void); |
| 1281 | 1278 | ||
| 1282 | static unsigned long last_valid_pfn; | 1279 | static unsigned long last_valid_pfn; |
diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c index 3f10fc921b00..a0f000b293de 100644 --- a/arch/sparc64/mm/tlb.c +++ b/arch/sparc64/mm/tlb.c | |||
| @@ -23,10 +23,11 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) = { 0, }; | |||
| 23 | 23 | ||
| 24 | void flush_tlb_pending(void) | 24 | void flush_tlb_pending(void) |
| 25 | { | 25 | { |
| 26 | struct mmu_gather *mp = &__get_cpu_var(mmu_gathers); | 26 | struct mmu_gather *mp; |
| 27 | 27 | ||
| 28 | preempt_disable(); | 28 | preempt_disable(); |
| 29 | 29 | ||
| 30 | mp = &__get_cpu_var(mmu_gathers); | ||
| 30 | if (mp->tlb_nr) { | 31 | if (mp->tlb_nr) { |
| 31 | flush_tsb_user(mp); | 32 | flush_tsb_user(mp); |
| 32 | 33 | ||
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 1e8f41a99511..1d43bdfc20c4 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
| @@ -256,11 +256,7 @@ static struct net_device_stats *uml_net_get_stats(struct net_device *dev) | |||
| 256 | 256 | ||
| 257 | static void uml_net_set_multicast_list(struct net_device *dev) | 257 | static void uml_net_set_multicast_list(struct net_device *dev) |
| 258 | { | 258 | { |
| 259 | if (dev->flags & IFF_PROMISC) | 259 | return; |
| 260 | return; | ||
| 261 | else if (dev->mc_count) | ||
| 262 | dev->flags |= IFF_ALLMULTI; | ||
| 263 | else dev->flags &= ~IFF_ALLMULTI; | ||
| 264 | } | 260 | } |
| 265 | 261 | ||
| 266 | static void uml_net_tx_timeout(struct net_device *dev) | 262 | static void uml_net_tx_timeout(struct net_device *dev) |
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c index f2b5a621d27b..8a85c93bd62a 100644 --- a/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c +++ b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | |||
| @@ -63,7 +63,7 @@ static struct cpufreq_frequency_table speedstep_freqs[] = { | |||
| 63 | */ | 63 | */ |
| 64 | static int speedstep_smi_ownership (void) | 64 | static int speedstep_smi_ownership (void) |
| 65 | { | 65 | { |
| 66 | u32 command, result, magic; | 66 | u32 command, result, magic, dummy; |
| 67 | u32 function = GET_SPEEDSTEP_OWNER; | 67 | u32 function = GET_SPEEDSTEP_OWNER; |
| 68 | unsigned char magic_data[] = "Copyright (c) 1999 Intel Corporation"; | 68 | unsigned char magic_data[] = "Copyright (c) 1999 Intel Corporation"; |
| 69 | 69 | ||
| @@ -73,8 +73,11 @@ static int speedstep_smi_ownership (void) | |||
| 73 | dprintk("trying to obtain ownership with command %x at port %x\n", command, smi_port); | 73 | dprintk("trying to obtain ownership with command %x at port %x\n", command, smi_port); |
| 74 | 74 | ||
| 75 | __asm__ __volatile__( | 75 | __asm__ __volatile__( |
| 76 | "push %%ebp\n" | ||
| 76 | "out %%al, (%%dx)\n" | 77 | "out %%al, (%%dx)\n" |
| 77 | : "=D" (result) | 78 | "pop %%ebp\n" |
| 79 | : "=D" (result), "=a" (dummy), "=b" (dummy), "=c" (dummy), "=d" (dummy), | ||
| 80 | "=S" (dummy) | ||
| 78 | : "a" (command), "b" (function), "c" (0), "d" (smi_port), | 81 | : "a" (command), "b" (function), "c" (0), "d" (smi_port), |
| 79 | "D" (0), "S" (magic) | 82 | "D" (0), "S" (magic) |
| 80 | : "memory" | 83 | : "memory" |
| @@ -96,7 +99,7 @@ static int speedstep_smi_ownership (void) | |||
| 96 | */ | 99 | */ |
| 97 | static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high) | 100 | static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high) |
| 98 | { | 101 | { |
| 99 | u32 command, result = 0, edi, high_mhz, low_mhz; | 102 | u32 command, result = 0, edi, high_mhz, low_mhz, dummy; |
| 100 | u32 state=0; | 103 | u32 state=0; |
| 101 | u32 function = GET_SPEEDSTEP_FREQS; | 104 | u32 function = GET_SPEEDSTEP_FREQS; |
| 102 | 105 | ||
| @@ -109,10 +112,12 @@ static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high) | |||
| 109 | 112 | ||
| 110 | dprintk("trying to determine frequencies with command %x at port %x\n", command, smi_port); | 113 | dprintk("trying to determine frequencies with command %x at port %x\n", command, smi_port); |
| 111 | 114 | ||
| 112 | __asm__ __volatile__("movl $0, %%edi\n" | 115 | __asm__ __volatile__( |
| 116 | "push %%ebp\n" | ||
| 113 | "out %%al, (%%dx)\n" | 117 | "out %%al, (%%dx)\n" |
| 114 | : "=a" (result), "=b" (high_mhz), "=c" (low_mhz), "=d" (state), "=D" (edi) | 118 | "pop %%ebp" |
| 115 | : "a" (command), "b" (function), "c" (state), "d" (smi_port), "S" (0) | 119 | : "=a" (result), "=b" (high_mhz), "=c" (low_mhz), "=d" (state), "=D" (edi), "=S" (dummy) |
| 120 | : "a" (command), "b" (function), "c" (state), "d" (smi_port), "S" (0), "D" (0) | ||
| 116 | ); | 121 | ); |
| 117 | 122 | ||
| 118 | dprintk("result %x, low_freq %u, high_freq %u\n", result, low_mhz, high_mhz); | 123 | dprintk("result %x, low_freq %u, high_freq %u\n", result, low_mhz, high_mhz); |
| @@ -135,16 +140,18 @@ static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high) | |||
| 135 | static int speedstep_get_state (void) | 140 | static int speedstep_get_state (void) |
| 136 | { | 141 | { |
| 137 | u32 function=GET_SPEEDSTEP_STATE; | 142 | u32 function=GET_SPEEDSTEP_STATE; |
| 138 | u32 result, state, edi, command; | 143 | u32 result, state, edi, command, dummy; |
| 139 | 144 | ||
| 140 | command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff); | 145 | command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff); |
| 141 | 146 | ||
| 142 | dprintk("trying to determine current setting with command %x at port %x\n", command, smi_port); | 147 | dprintk("trying to determine current setting with command %x at port %x\n", command, smi_port); |
| 143 | 148 | ||
| 144 | __asm__ __volatile__("movl $0, %%edi\n" | 149 | __asm__ __volatile__( |
| 150 | "push %%ebp\n" | ||
| 145 | "out %%al, (%%dx)\n" | 151 | "out %%al, (%%dx)\n" |
| 146 | : "=a" (result), "=b" (state), "=D" (edi) | 152 | "pop %%ebp\n" |
| 147 | : "a" (command), "b" (function), "c" (0), "d" (smi_port), "S" (0) | 153 | : "=a" (result), "=b" (state), "=D" (edi), "=c" (dummy), "=d" (dummy), "=S" (dummy) |
| 154 | : "a" (command), "b" (function), "c" (0), "d" (smi_port), "S" (0), "D" (0) | ||
| 148 | ); | 155 | ); |
| 149 | 156 | ||
| 150 | dprintk("state is %x, result is %x\n", state, result); | 157 | dprintk("state is %x, result is %x\n", state, result); |
| @@ -160,7 +167,7 @@ static int speedstep_get_state (void) | |||
| 160 | */ | 167 | */ |
| 161 | static void speedstep_set_state (unsigned int state) | 168 | static void speedstep_set_state (unsigned int state) |
| 162 | { | 169 | { |
| 163 | unsigned int result = 0, command, new_state; | 170 | unsigned int result = 0, command, new_state, dummy; |
| 164 | unsigned long flags; | 171 | unsigned long flags; |
| 165 | unsigned int function=SET_SPEEDSTEP_STATE; | 172 | unsigned int function=SET_SPEEDSTEP_STATE; |
| 166 | unsigned int retry = 0; | 173 | unsigned int retry = 0; |
| @@ -182,10 +189,12 @@ static void speedstep_set_state (unsigned int state) | |||
| 182 | } | 189 | } |
| 183 | retry++; | 190 | retry++; |
| 184 | __asm__ __volatile__( | 191 | __asm__ __volatile__( |
| 185 | "movl $0, %%edi\n" | 192 | "push %%ebp\n" |
| 186 | "out %%al, (%%dx)\n" | 193 | "out %%al, (%%dx)\n" |
| 187 | : "=b" (new_state), "=D" (result) | 194 | "pop %%ebp" |
| 188 | : "a" (command), "b" (function), "c" (state), "d" (smi_port), "S" (0) | 195 | : "=b" (new_state), "=D" (result), "=c" (dummy), "=a" (dummy), |
| 196 | "=d" (dummy), "=S" (dummy) | ||
| 197 | : "a" (command), "b" (function), "c" (state), "d" (smi_port), "S" (0), "D" (0) | ||
| 189 | ); | 198 | ); |
| 190 | } while ((new_state != state) && (retry <= SMI_TRIES)); | 199 | } while ((new_state != state) && (retry <= SMI_TRIES)); |
| 191 | 200 | ||
| @@ -195,7 +204,7 @@ static void speedstep_set_state (unsigned int state) | |||
| 195 | if (new_state == state) { | 204 | if (new_state == state) { |
| 196 | dprintk("change to %u MHz succeeded after %u tries with result %u\n", (speedstep_freqs[new_state].frequency / 1000), retry, result); | 205 | dprintk("change to %u MHz succeeded after %u tries with result %u\n", (speedstep_freqs[new_state].frequency / 1000), retry, result); |
| 197 | } else { | 206 | } else { |
| 198 | printk(KERN_ERR "cpufreq: change failed with new_state %u and result %u\n", new_state, result); | 207 | printk(KERN_ERR "cpufreq: change to state %u failed with new_state %u and result %u\n", state, new_state, result); |
| 199 | } | 208 | } |
| 200 | 209 | ||
| 201 | return; | 210 | return; |
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index 103d61a59b19..3e18db4cefee 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c | |||
| @@ -176,12 +176,13 @@ static inline void k8_enable_fixed_iorrs(void) | |||
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | /** | 178 | /** |
| 179 | * Checks and updates an fixed-range MTRR if it differs from the value it | 179 | * set_fixed_range - checks & updates a fixed-range MTRR if it differs from the value it should have |
| 180 | * should have. If K8 extentions are wanted, update the K8 SYSCFG MSR also. | 180 | * @msr: MSR address of the MTTR which should be checked and updated |
| 181 | * see AMD publication no. 24593, chapter 7.8.1, page 233 for more information | 181 | * @changed: pointer which indicates whether the MTRR needed to be changed |
| 182 | * \param msr MSR address of the MTTR which should be checked and updated | 182 | * @msrwords: pointer to the MSR values which the MSR should have |
| 183 | * \param changed pointer which indicates whether the MTRR needed to be changed | 183 | * |
| 184 | * \param msrwords pointer to the MSR values which the MSR should have | 184 | * If K8 extentions are wanted, update the K8 SYSCFG MSR also. |
| 185 | * See AMD publication no. 24593, chapter 7.8.1, page 233 for more information. | ||
| 185 | */ | 186 | */ |
| 186 | static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords) | 187 | static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords) |
| 187 | { | 188 | { |
| @@ -199,12 +200,15 @@ static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords) | |||
| 199 | } | 200 | } |
| 200 | } | 201 | } |
| 201 | 202 | ||
| 203 | /** | ||
| 204 | * generic_get_free_region - Get a free MTRR. | ||
| 205 | * @base: The starting (base) address of the region. | ||
| 206 | * @size: The size (in bytes) of the region. | ||
| 207 | * @replace_reg: mtrr index to be replaced; set to invalid value if none. | ||
| 208 | * | ||
| 209 | * Returns: The index of the region on success, else negative on error. | ||
| 210 | */ | ||
| 202 | int generic_get_free_region(unsigned long base, unsigned long size, int replace_reg) | 211 | int generic_get_free_region(unsigned long base, unsigned long size, int replace_reg) |
| 203 | /* [SUMMARY] Get a free MTRR. | ||
| 204 | <base> The starting (base) address of the region. | ||
| 205 | <size> The size (in bytes) of the region. | ||
| 206 | [RETURNS] The index of the region on success, else -1 on error. | ||
| 207 | */ | ||
| 208 | { | 212 | { |
| 209 | int i, max; | 213 | int i, max; |
| 210 | mtrr_type ltype; | 214 | mtrr_type ltype; |
| @@ -249,8 +253,8 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, | |||
| 249 | } | 253 | } |
| 250 | 254 | ||
| 251 | /** | 255 | /** |
| 252 | * Checks and updates the fixed-range MTRRs if they differ from the saved set | 256 | * set_fixed_ranges - checks & updates the fixed-range MTRRs if they differ from the saved set |
| 253 | * \param frs pointer to fixed-range MTRR values, saved by get_fixed_ranges() | 257 | * @frs: pointer to fixed-range MTRR values, saved by get_fixed_ranges() |
| 254 | */ | 258 | */ |
| 255 | static int set_fixed_ranges(mtrr_type * frs) | 259 | static int set_fixed_ranges(mtrr_type * frs) |
| 256 | { | 260 | { |
| @@ -294,13 +298,13 @@ static bool set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) | |||
| 294 | 298 | ||
| 295 | static u32 deftype_lo, deftype_hi; | 299 | static u32 deftype_lo, deftype_hi; |
| 296 | 300 | ||
| 301 | /** | ||
| 302 | * set_mtrr_state - Set the MTRR state for this CPU. | ||
| 303 | * | ||
| 304 | * NOTE: The CPU must already be in a safe state for MTRR changes. | ||
| 305 | * RETURNS: 0 if no changes made, else a mask indicating what was changed. | ||
| 306 | */ | ||
| 297 | static unsigned long set_mtrr_state(void) | 307 | static unsigned long set_mtrr_state(void) |
| 298 | /* [SUMMARY] Set the MTRR state for this CPU. | ||
| 299 | <state> The MTRR state information to read. | ||
| 300 | <ctxt> Some relevant CPU context. | ||
| 301 | [NOTE] The CPU must already be in a safe state for MTRR changes. | ||
| 302 | [RETURNS] 0 if no changes made, else a mask indication what was changed. | ||
| 303 | */ | ||
| 304 | { | 308 | { |
| 305 | unsigned int i; | 309 | unsigned int i; |
| 306 | unsigned long change_mask = 0; | 310 | unsigned long change_mask = 0; |
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c index c706a3061553..5921e5f0a640 100644 --- a/arch/x86/kernel/io_delay.c +++ b/arch/x86/kernel/io_delay.c | |||
| @@ -78,6 +78,14 @@ static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = { | |||
| 78 | }, | 78 | }, |
| 79 | { | 79 | { |
| 80 | .callback = dmi_io_delay_0xed_port, | 80 | .callback = dmi_io_delay_0xed_port, |
| 81 | .ident = "HP Pavilion dv6000", | ||
| 82 | .matches = { | ||
| 83 | DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"), | ||
| 84 | DMI_MATCH(DMI_BOARD_NAME, "30B8") | ||
| 85 | } | ||
| 86 | }, | ||
| 87 | { | ||
| 88 | .callback = dmi_io_delay_0xed_port, | ||
| 81 | .ident = "HP Pavilion tx1000", | 89 | .ident = "HP Pavilion tx1000", |
| 82 | .matches = { | 90 | .matches = { |
| 83 | DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"), | 91 | DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"), |
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 027fc067b399..b402c0f3f192 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
| 33 | #include <linux/module.h> | ||
| 33 | #include <asm/geode.h> | 34 | #include <asm/geode.h> |
| 34 | 35 | ||
| 35 | static struct mfgpt_timer_t { | 36 | static struct mfgpt_timer_t { |
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index d5904eef1d31..eb92ccbb3502 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c | |||
| @@ -600,21 +600,6 @@ static int ptrace_bts_read_record(struct task_struct *child, | |||
| 600 | return sizeof(ret); | 600 | return sizeof(ret); |
| 601 | } | 601 | } |
| 602 | 602 | ||
| 603 | static int ptrace_bts_write_record(struct task_struct *child, | ||
| 604 | const struct bts_struct *in) | ||
| 605 | { | ||
| 606 | int retval; | ||
| 607 | |||
| 608 | if (!child->thread.ds_area_msr) | ||
| 609 | return -ENXIO; | ||
| 610 | |||
| 611 | retval = ds_write_bts((void *)child->thread.ds_area_msr, in); | ||
| 612 | if (retval) | ||
| 613 | return retval; | ||
| 614 | |||
| 615 | return sizeof(*in); | ||
| 616 | } | ||
| 617 | |||
| 618 | static int ptrace_bts_clear(struct task_struct *child) | 603 | static int ptrace_bts_clear(struct task_struct *child) |
| 619 | { | 604 | { |
| 620 | if (!child->thread.ds_area_msr) | 605 | if (!child->thread.ds_area_msr) |
| @@ -657,75 +642,6 @@ static int ptrace_bts_drain(struct task_struct *child, | |||
| 657 | return end; | 642 | return end; |
| 658 | } | 643 | } |
| 659 | 644 | ||
| 660 | static int ptrace_bts_realloc(struct task_struct *child, | ||
| 661 | int size, int reduce_size) | ||
| 662 | { | ||
| 663 | unsigned long rlim, vm; | ||
| 664 | int ret, old_size; | ||
| 665 | |||
| 666 | if (size < 0) | ||
| 667 | return -EINVAL; | ||
| 668 | |||
| 669 | old_size = ds_get_bts_size((void *)child->thread.ds_area_msr); | ||
| 670 | if (old_size < 0) | ||
| 671 | return old_size; | ||
| 672 | |||
| 673 | ret = ds_free((void **)&child->thread.ds_area_msr); | ||
| 674 | if (ret < 0) | ||
| 675 | goto out; | ||
| 676 | |||
| 677 | size >>= PAGE_SHIFT; | ||
| 678 | old_size >>= PAGE_SHIFT; | ||
| 679 | |||
| 680 | current->mm->total_vm -= old_size; | ||
| 681 | current->mm->locked_vm -= old_size; | ||
| 682 | |||
| 683 | if (size == 0) | ||
| 684 | goto out; | ||
| 685 | |||
| 686 | rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; | ||
| 687 | vm = current->mm->total_vm + size; | ||
| 688 | if (rlim < vm) { | ||
| 689 | ret = -ENOMEM; | ||
| 690 | |||
| 691 | if (!reduce_size) | ||
| 692 | goto out; | ||
| 693 | |||
| 694 | size = rlim - current->mm->total_vm; | ||
| 695 | if (size <= 0) | ||
| 696 | goto out; | ||
| 697 | } | ||
| 698 | |||
| 699 | rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT; | ||
| 700 | vm = current->mm->locked_vm + size; | ||
| 701 | if (rlim < vm) { | ||
| 702 | ret = -ENOMEM; | ||
| 703 | |||
| 704 | if (!reduce_size) | ||
| 705 | goto out; | ||
| 706 | |||
| 707 | size = rlim - current->mm->locked_vm; | ||
| 708 | if (size <= 0) | ||
| 709 | goto out; | ||
| 710 | } | ||
| 711 | |||
| 712 | ret = ds_allocate((void **)&child->thread.ds_area_msr, | ||
| 713 | size << PAGE_SHIFT); | ||
| 714 | if (ret < 0) | ||
| 715 | goto out; | ||
| 716 | |||
| 717 | current->mm->total_vm += size; | ||
| 718 | current->mm->locked_vm += size; | ||
| 719 | |||
| 720 | out: | ||
| 721 | if (child->thread.ds_area_msr) | ||
| 722 | set_tsk_thread_flag(child, TIF_DS_AREA_MSR); | ||
| 723 | else | ||
| 724 | clear_tsk_thread_flag(child, TIF_DS_AREA_MSR); | ||
| 725 | |||
| 726 | return ret; | ||
| 727 | } | ||
| 728 | |||
| 729 | static int ptrace_bts_config(struct task_struct *child, | 645 | static int ptrace_bts_config(struct task_struct *child, |
| 730 | long cfg_size, | 646 | long cfg_size, |
| 731 | const struct ptrace_bts_config __user *ucfg) | 647 | const struct ptrace_bts_config __user *ucfg) |
| @@ -828,6 +744,91 @@ static int ptrace_bts_status(struct task_struct *child, | |||
| 828 | return sizeof(cfg); | 744 | return sizeof(cfg); |
| 829 | } | 745 | } |
| 830 | 746 | ||
| 747 | |||
| 748 | static int ptrace_bts_write_record(struct task_struct *child, | ||
| 749 | const struct bts_struct *in) | ||
| 750 | { | ||
| 751 | int retval; | ||
| 752 | |||
| 753 | if (!child->thread.ds_area_msr) | ||
| 754 | return -ENXIO; | ||
| 755 | |||
| 756 | retval = ds_write_bts((void *)child->thread.ds_area_msr, in); | ||
| 757 | if (retval) | ||
| 758 | return retval; | ||
| 759 | |||
| 760 | return sizeof(*in); | ||
| 761 | } | ||
| 762 | |||
| 763 | static int ptrace_bts_realloc(struct task_struct *child, | ||
| 764 | int size, int reduce_size) | ||
| 765 | { | ||
| 766 | unsigned long rlim, vm; | ||
| 767 | int ret, old_size; | ||
| 768 | |||
| 769 | if (size < 0) | ||
| 770 | return -EINVAL; | ||
| 771 | |||
| 772 | old_size = ds_get_bts_size((void *)child->thread.ds_area_msr); | ||
| 773 | if (old_size < 0) | ||
| 774 | return old_size; | ||
| 775 | |||
| 776 | ret = ds_free((void **)&child->thread.ds_area_msr); | ||
| 777 | if (ret < 0) | ||
| 778 | goto out; | ||
| 779 | |||
| 780 | size >>= PAGE_SHIFT; | ||
| 781 | old_size >>= PAGE_SHIFT; | ||
| 782 | |||
| 783 | current->mm->total_vm -= old_size; | ||
| 784 | current->mm->locked_vm -= old_size; | ||
| 785 | |||
| 786 | if (size == 0) | ||
| 787 | goto out; | ||
| 788 | |||
| 789 | rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; | ||
| 790 | vm = current->mm->total_vm + size; | ||
| 791 | if (rlim < vm) { | ||
| 792 | ret = -ENOMEM; | ||
| 793 | |||
| 794 | if (!reduce_size) | ||
| 795 | goto out; | ||
| 796 | |||
| 797 | size = rlim - current->mm->total_vm; | ||
| 798 | if (size <= 0) | ||
| 799 | goto out; | ||
| 800 | } | ||
| 801 | |||
| 802 | rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT; | ||
| 803 | vm = current->mm->locked_vm + size; | ||
| 804 | if (rlim < vm) { | ||
| 805 | ret = -ENOMEM; | ||
| 806 | |||
| 807 | if (!reduce_size) | ||
| 808 | goto out; | ||
| 809 | |||
| 810 | size = rlim - current->mm->locked_vm; | ||
| 811 | if (size <= 0) | ||
| 812 | goto out; | ||
| 813 | } | ||
| 814 | |||
| 815 | ret = ds_allocate((void **)&child->thread.ds_area_msr, | ||
| 816 | size << PAGE_SHIFT); | ||
| 817 | if (ret < 0) | ||
| 818 | goto out; | ||
| 819 | |||
| 820 | current->mm->total_vm += size; | ||
| 821 | current->mm->locked_vm += size; | ||
| 822 | |||
| 823 | out: | ||
| 824 | if (child->thread.ds_area_msr) | ||
| 825 | set_tsk_thread_flag(child, TIF_DS_AREA_MSR); | ||
| 826 | else | ||
| 827 | clear_tsk_thread_flag(child, TIF_DS_AREA_MSR); | ||
| 828 | |||
| 829 | return ret; | ||
| 830 | } | ||
| 831 | |||
| 831 | void ptrace_bts_take_timestamp(struct task_struct *tsk, | 832 | void ptrace_bts_take_timestamp(struct task_struct *tsk, |
| 832 | enum bts_qualifier qualifier) | 833 | enum bts_qualifier qualifier) |
| 833 | { | 834 | { |
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index a1d7071a51c9..2b3e5d45176b 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
| @@ -406,8 +406,6 @@ static unsigned long __init setup_memory(void) | |||
| 406 | */ | 406 | */ |
| 407 | min_low_pfn = PFN_UP(init_pg_tables_end); | 407 | min_low_pfn = PFN_UP(init_pg_tables_end); |
| 408 | 408 | ||
| 409 | find_max_pfn(); | ||
| 410 | |||
| 411 | max_low_pfn = find_max_low_pfn(); | 409 | max_low_pfn = find_max_low_pfn(); |
| 412 | 410 | ||
| 413 | #ifdef CONFIG_HIGHMEM | 411 | #ifdef CONFIG_HIGHMEM |
| @@ -764,12 +762,13 @@ void __init setup_arch(char **cmdline_p) | |||
| 764 | if (efi_enabled) | 762 | if (efi_enabled) |
| 765 | efi_init(); | 763 | efi_init(); |
| 766 | 764 | ||
| 767 | max_low_pfn = setup_memory(); | ||
| 768 | |||
| 769 | /* update e820 for memory not covered by WB MTRRs */ | 765 | /* update e820 for memory not covered by WB MTRRs */ |
| 766 | find_max_pfn(); | ||
| 770 | mtrr_bp_init(); | 767 | mtrr_bp_init(); |
| 771 | if (mtrr_trim_uncached_memory(max_pfn)) | 768 | if (mtrr_trim_uncached_memory(max_pfn)) |
| 772 | max_low_pfn = setup_memory(); | 769 | find_max_pfn(); |
| 770 | |||
| 771 | max_low_pfn = setup_memory(); | ||
| 773 | 772 | ||
| 774 | #ifdef CONFIG_VMI | 773 | #ifdef CONFIG_VMI |
| 775 | /* | 774 | /* |
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 7637dc91c79b..f4f7ecfb898c 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
| @@ -801,7 +801,7 @@ static void __cpuinit srat_detect_node(void) | |||
| 801 | /* Don't do the funky fallback heuristics the AMD version employs | 801 | /* Don't do the funky fallback heuristics the AMD version employs |
| 802 | for now. */ | 802 | for now. */ |
| 803 | node = apicid_to_node[apicid]; | 803 | node = apicid_to_node[apicid]; |
| 804 | if (node == NUMA_NO_NODE) | 804 | if (node == NUMA_NO_NODE || !node_online(node)) |
| 805 | node = first_node(node_online_map); | 805 | node = first_node(node_online_map); |
| 806 | numa_set_node(cpu, node); | 806 | numa_set_node(cpu, node); |
| 807 | 807 | ||
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index a104c532ff70..3335b4595efd 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
| @@ -10,21 +10,19 @@ | |||
| 10 | * (such as the example in Documentation/lguest/lguest.c) is called the | 10 | * (such as the example in Documentation/lguest/lguest.c) is called the |
| 11 | * Launcher. | 11 | * Launcher. |
| 12 | * | 12 | * |
| 13 | * Secondly, we only run specially modified Guests, not normal kernels. When | 13 | * Secondly, we only run specially modified Guests, not normal kernels: setting |
| 14 | * you set CONFIG_LGUEST to 'y' or 'm', this automatically sets | 14 | * CONFIG_LGUEST_GUEST to "y" compiles this file into the kernel so it knows |
| 15 | * CONFIG_LGUEST_GUEST=y, which compiles this file into the kernel so it knows | 15 | * how to be a Guest at boot time. This means that you can use the same kernel |
| 16 | * how to be a Guest. This means that you can use the same kernel you boot | 16 | * you boot normally (ie. as a Host) as a Guest. |
| 17 | * normally (ie. as a Host) as a Guest. | ||
| 18 | * | 17 | * |
| 19 | * These Guests know that they cannot do privileged operations, such as disable | 18 | * These Guests know that they cannot do privileged operations, such as disable |
| 20 | * interrupts, and that they have to ask the Host to do such things explicitly. | 19 | * interrupts, and that they have to ask the Host to do such things explicitly. |
| 21 | * This file consists of all the replacements for such low-level native | 20 | * This file consists of all the replacements for such low-level native |
| 22 | * hardware operations: these special Guest versions call the Host. | 21 | * hardware operations: these special Guest versions call the Host. |
| 23 | * | 22 | * |
| 24 | * So how does the kernel know it's a Guest? The Guest starts at a special | 23 | * So how does the kernel know it's a Guest? We'll see that later, but let's |
| 25 | * entry point marked with a magic string, which sets up a few things then | 24 | * just say that we end up here where we replace the native functions various |
| 26 | * calls here. We replace the native functions various "paravirt" structures | 25 | * "paravirt" structures with our Guest versions, then boot like normal. :*/ |
| 27 | * with our Guest versions, then boot like normal. :*/ | ||
| 28 | 26 | ||
| 29 | /* | 27 | /* |
| 30 | * Copyright (C) 2006, Rusty Russell <rusty@rustcorp.com.au> IBM Corporation. | 28 | * Copyright (C) 2006, Rusty Russell <rusty@rustcorp.com.au> IBM Corporation. |
| @@ -134,7 +132,7 @@ static void async_hcall(unsigned long call, unsigned long arg1, | |||
| 134 | * lguest_leave_lazy_mode(). | 132 | * lguest_leave_lazy_mode(). |
| 135 | * | 133 | * |
| 136 | * So, when we're in lazy mode, we call async_hcall() to store the call for | 134 | * So, when we're in lazy mode, we call async_hcall() to store the call for |
| 137 | * future processing. */ | 135 | * future processing: */ |
| 138 | static void lazy_hcall(unsigned long call, | 136 | static void lazy_hcall(unsigned long call, |
| 139 | unsigned long arg1, | 137 | unsigned long arg1, |
| 140 | unsigned long arg2, | 138 | unsigned long arg2, |
| @@ -147,7 +145,7 @@ static void lazy_hcall(unsigned long call, | |||
| 147 | } | 145 | } |
| 148 | 146 | ||
| 149 | /* When lazy mode is turned off reset the per-cpu lazy mode variable and then | 147 | /* When lazy mode is turned off reset the per-cpu lazy mode variable and then |
| 150 | * issue a hypercall to flush any stored calls. */ | 148 | * issue the do-nothing hypercall to flush any stored calls. */ |
| 151 | static void lguest_leave_lazy_mode(void) | 149 | static void lguest_leave_lazy_mode(void) |
| 152 | { | 150 | { |
| 153 | paravirt_leave_lazy(paravirt_get_lazy_mode()); | 151 | paravirt_leave_lazy(paravirt_get_lazy_mode()); |
| @@ -164,7 +162,7 @@ static void lguest_leave_lazy_mode(void) | |||
| 164 | * | 162 | * |
| 165 | * So instead we keep an "irq_enabled" field inside our "struct lguest_data", | 163 | * So instead we keep an "irq_enabled" field inside our "struct lguest_data", |
| 166 | * which the Guest can update with a single instruction. The Host knows to | 164 | * which the Guest can update with a single instruction. The Host knows to |
| 167 | * check there when it wants to deliver an interrupt. | 165 | * check there before it tries to deliver an interrupt. |
| 168 | */ | 166 | */ |
| 169 | 167 | ||
| 170 | /* save_flags() is expected to return the processor state (ie. "flags"). The | 168 | /* save_flags() is expected to return the processor state (ie. "flags"). The |
| @@ -196,10 +194,15 @@ static void irq_enable(void) | |||
| 196 | /*M:003 Note that we don't check for outstanding interrupts when we re-enable | 194 | /*M:003 Note that we don't check for outstanding interrupts when we re-enable |
| 197 | * them (or when we unmask an interrupt). This seems to work for the moment, | 195 | * them (or when we unmask an interrupt). This seems to work for the moment, |
| 198 | * since interrupts are rare and we'll just get the interrupt on the next timer | 196 | * since interrupts are rare and we'll just get the interrupt on the next timer |
| 199 | * tick, but when we turn on CONFIG_NO_HZ, we should revisit this. One way | 197 | * tick, but now we can run with CONFIG_NO_HZ, we should revisit this. One way |
| 200 | * would be to put the "irq_enabled" field in a page by itself, and have the | 198 | * would be to put the "irq_enabled" field in a page by itself, and have the |
| 201 | * Host write-protect it when an interrupt comes in when irqs are disabled. | 199 | * Host write-protect it when an interrupt comes in when irqs are disabled. |
| 202 | * There will then be a page fault as soon as interrupts are re-enabled. :*/ | 200 | * There will then be a page fault as soon as interrupts are re-enabled. |
| 201 | * | ||
| 202 | * A better method is to implement soft interrupt disable generally for x86: | ||
| 203 | * instead of disabling interrupts, we set a flag. If an interrupt does come | ||
| 204 | * in, we then disable them for real. This is uncommon, so we could simply use | ||
| 205 | * a hypercall for interrupt control and not worry about efficiency. :*/ | ||
| 203 | 206 | ||
| 204 | /*G:034 | 207 | /*G:034 |
| 205 | * The Interrupt Descriptor Table (IDT). | 208 | * The Interrupt Descriptor Table (IDT). |
| @@ -212,6 +215,10 @@ static void irq_enable(void) | |||
| 212 | static void lguest_write_idt_entry(gate_desc *dt, | 215 | static void lguest_write_idt_entry(gate_desc *dt, |
| 213 | int entrynum, const gate_desc *g) | 216 | int entrynum, const gate_desc *g) |
| 214 | { | 217 | { |
| 218 | /* The gate_desc structure is 8 bytes long: we hand it to the Host in | ||
| 219 | * two 32-bit chunks. The whole 32-bit kernel used to hand descriptors | ||
| 220 | * around like this; typesafety wasn't a big concern in Linux's early | ||
| 221 | * years. */ | ||
| 215 | u32 *desc = (u32 *)g; | 222 | u32 *desc = (u32 *)g; |
| 216 | /* Keep the local copy up to date. */ | 223 | /* Keep the local copy up to date. */ |
| 217 | native_write_idt_entry(dt, entrynum, g); | 224 | native_write_idt_entry(dt, entrynum, g); |
| @@ -243,7 +250,8 @@ static void lguest_load_idt(const struct desc_ptr *desc) | |||
| 243 | * | 250 | * |
| 244 | * This is the opposite of the IDT code where we have a LOAD_IDT_ENTRY | 251 | * This is the opposite of the IDT code where we have a LOAD_IDT_ENTRY |
| 245 | * hypercall and use that repeatedly to load a new IDT. I don't think it | 252 | * hypercall and use that repeatedly to load a new IDT. I don't think it |
| 246 | * really matters, but wouldn't it be nice if they were the same? | 253 | * really matters, but wouldn't it be nice if they were the same? Wouldn't |
| 254 | * it be even better if you were the one to send the patch to fix it? | ||
| 247 | */ | 255 | */ |
| 248 | static void lguest_load_gdt(const struct desc_ptr *desc) | 256 | static void lguest_load_gdt(const struct desc_ptr *desc) |
| 249 | { | 257 | { |
| @@ -298,9 +306,9 @@ static void lguest_load_tr_desc(void) | |||
| 298 | 306 | ||
| 299 | /* The "cpuid" instruction is a way of querying both the CPU identity | 307 | /* The "cpuid" instruction is a way of querying both the CPU identity |
| 300 | * (manufacturer, model, etc) and its features. It was introduced before the | 308 | * (manufacturer, model, etc) and its features. It was introduced before the |
| 301 | * Pentium in 1993 and keeps getting extended by both Intel and AMD. As you | 309 | * Pentium in 1993 and keeps getting extended by both Intel, AMD and others. |
| 302 | * might imagine, after a decade and a half this treatment, it is now a giant | 310 | * As you might imagine, after a decade and a half this treatment, it is now a |
| 303 | * ball of hair. Its entry in the current Intel manual runs to 28 pages. | 311 | * giant ball of hair. Its entry in the current Intel manual runs to 28 pages. |
| 304 | * | 312 | * |
| 305 | * This instruction even it has its own Wikipedia entry. The Wikipedia entry | 313 | * This instruction even it has its own Wikipedia entry. The Wikipedia entry |
| 306 | * has been translated into 4 languages. I am not making this up! | 314 | * has been translated into 4 languages. I am not making this up! |
| @@ -594,17 +602,17 @@ static unsigned long lguest_get_wallclock(void) | |||
| 594 | return lguest_data.time.tv_sec; | 602 | return lguest_data.time.tv_sec; |
| 595 | } | 603 | } |
| 596 | 604 | ||
| 597 | /* The TSC is a Time Stamp Counter. The Host tells us what speed it runs at, | 605 | /* The TSC is an Intel thing called the Time Stamp Counter. The Host tells us |
| 598 | * or 0 if it's unusable as a reliable clock source. This matches what we want | 606 | * what speed it runs at, or 0 if it's unusable as a reliable clock source. |
| 599 | * here: if we return 0 from this function, the x86 TSC clock will not register | 607 | * This matches what we want here: if we return 0 from this function, the x86 |
| 600 | * itself. */ | 608 | * TSC clock will give up and not register itself. */ |
| 601 | static unsigned long lguest_cpu_khz(void) | 609 | static unsigned long lguest_cpu_khz(void) |
| 602 | { | 610 | { |
| 603 | return lguest_data.tsc_khz; | 611 | return lguest_data.tsc_khz; |
| 604 | } | 612 | } |
| 605 | 613 | ||
| 606 | /* If we can't use the TSC, the kernel falls back to our "lguest_clock", where | 614 | /* If we can't use the TSC, the kernel falls back to our lower-priority |
| 607 | * we read the time value given to us by the Host. */ | 615 | * "lguest_clock", where we read the time value given to us by the Host. */ |
| 608 | static cycle_t lguest_clock_read(void) | 616 | static cycle_t lguest_clock_read(void) |
| 609 | { | 617 | { |
| 610 | unsigned long sec, nsec; | 618 | unsigned long sec, nsec; |
| @@ -648,12 +656,16 @@ static struct clocksource lguest_clock = { | |||
| 648 | static int lguest_clockevent_set_next_event(unsigned long delta, | 656 | static int lguest_clockevent_set_next_event(unsigned long delta, |
| 649 | struct clock_event_device *evt) | 657 | struct clock_event_device *evt) |
| 650 | { | 658 | { |
| 659 | /* FIXME: I don't think this can ever happen, but James tells me he had | ||
| 660 | * to put this code in. Maybe we should remove it now. Anyone? */ | ||
| 651 | if (delta < LG_CLOCK_MIN_DELTA) { | 661 | if (delta < LG_CLOCK_MIN_DELTA) { |
| 652 | if (printk_ratelimit()) | 662 | if (printk_ratelimit()) |
| 653 | printk(KERN_DEBUG "%s: small delta %lu ns\n", | 663 | printk(KERN_DEBUG "%s: small delta %lu ns\n", |
| 654 | __FUNCTION__, delta); | 664 | __FUNCTION__, delta); |
| 655 | return -ETIME; | 665 | return -ETIME; |
| 656 | } | 666 | } |
| 667 | |||
| 668 | /* Please wake us this far in the future. */ | ||
| 657 | hcall(LHCALL_SET_CLOCKEVENT, delta, 0, 0); | 669 | hcall(LHCALL_SET_CLOCKEVENT, delta, 0, 0); |
| 658 | return 0; | 670 | return 0; |
| 659 | } | 671 | } |
| @@ -738,7 +750,7 @@ static void lguest_time_init(void) | |||
| 738 | * will not tolerate us trying to use that), the stack pointer, and the number | 750 | * will not tolerate us trying to use that), the stack pointer, and the number |
| 739 | * of pages in the stack. */ | 751 | * of pages in the stack. */ |
| 740 | static void lguest_load_sp0(struct tss_struct *tss, | 752 | static void lguest_load_sp0(struct tss_struct *tss, |
| 741 | struct thread_struct *thread) | 753 | struct thread_struct *thread) |
| 742 | { | 754 | { |
| 743 | lazy_hcall(LHCALL_SET_STACK, __KERNEL_DS|0x1, thread->sp0, | 755 | lazy_hcall(LHCALL_SET_STACK, __KERNEL_DS|0x1, thread->sp0, |
| 744 | THREAD_SIZE/PAGE_SIZE); | 756 | THREAD_SIZE/PAGE_SIZE); |
| @@ -786,9 +798,8 @@ static void lguest_safe_halt(void) | |||
| 786 | hcall(LHCALL_HALT, 0, 0, 0); | 798 | hcall(LHCALL_HALT, 0, 0, 0); |
| 787 | } | 799 | } |
| 788 | 800 | ||
| 789 | /* Perhaps CRASH isn't the best name for this hypercall, but we use it to get a | 801 | /* The SHUTDOWN hypercall takes a string to describe what's happening, and |
| 790 | * message out when we're crashing as well as elegant termination like powering | 802 | * an argument which says whether this to restart (reboot) the Guest or not. |
| 791 | * off. | ||
| 792 | * | 803 | * |
| 793 | * Note that the Host always prefers that the Guest speak in physical addresses | 804 | * Note that the Host always prefers that the Guest speak in physical addresses |
| 794 | * rather than virtual addresses, so we use __pa() here. */ | 805 | * rather than virtual addresses, so we use __pa() here. */ |
| @@ -816,8 +827,9 @@ static struct notifier_block paniced = { | |||
| 816 | /* Setting up memory is fairly easy. */ | 827 | /* Setting up memory is fairly easy. */ |
| 817 | static __init char *lguest_memory_setup(void) | 828 | static __init char *lguest_memory_setup(void) |
| 818 | { | 829 | { |
| 819 | /* We do this here and not earlier because lockcheck barfs if we do it | 830 | /* We do this here and not earlier because lockcheck used to barf if we |
| 820 | * before start_kernel() */ | 831 | * did it before start_kernel(). I think we fixed that, so it'd be |
| 832 | * nice to move it back to lguest_init. Patch welcome... */ | ||
| 821 | atomic_notifier_chain_register(&panic_notifier_list, &paniced); | 833 | atomic_notifier_chain_register(&panic_notifier_list, &paniced); |
| 822 | 834 | ||
| 823 | /* The Linux bootloader header contains an "e820" memory map: the | 835 | /* The Linux bootloader header contains an "e820" memory map: the |
| @@ -850,12 +862,19 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count) | |||
| 850 | return len; | 862 | return len; |
| 851 | } | 863 | } |
| 852 | 864 | ||
| 865 | /* Rebooting also tells the Host we're finished, but the RESTART flag tells the | ||
| 866 | * Launcher to reboot us. */ | ||
| 867 | static void lguest_restart(char *reason) | ||
| 868 | { | ||
| 869 | hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0); | ||
| 870 | } | ||
| 871 | |||
| 853 | /*G:050 | 872 | /*G:050 |
| 854 | * Patching (Powerfully Placating Performance Pedants) | 873 | * Patching (Powerfully Placating Performance Pedants) |
| 855 | * | 874 | * |
| 856 | * We have already seen that pv_ops structures let us replace simple | 875 | * We have already seen that pv_ops structures let us replace simple native |
| 857 | * native instructions with calls to the appropriate back end all throughout | 876 | * instructions with calls to the appropriate back end all throughout the |
| 858 | * the kernel. This allows the same kernel to run as a Guest and as a native | 877 | * kernel. This allows the same kernel to run as a Guest and as a native |
| 859 | * kernel, but it's slow because of all the indirect branches. | 878 | * kernel, but it's slow because of all the indirect branches. |
| 860 | * | 879 | * |
| 861 | * Remember that David Wheeler quote about "Any problem in computer science can | 880 | * Remember that David Wheeler quote about "Any problem in computer science can |
| @@ -908,14 +927,9 @@ static unsigned lguest_patch(u8 type, u16 clobber, void *ibuf, | |||
| 908 | return insn_len; | 927 | return insn_len; |
| 909 | } | 928 | } |
| 910 | 929 | ||
| 911 | static void lguest_restart(char *reason) | 930 | /*G:030 Once we get to lguest_init(), we know we're a Guest. The various |
| 912 | { | 931 | * pv_ops structures in the kernel provide points for (almost) every routine we |
| 913 | hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0); | 932 | * have to override to avoid privileged instructions. */ |
| 914 | } | ||
| 915 | |||
| 916 | /*G:030 Once we get to lguest_init(), we know we're a Guest. The pv_ops | ||
| 917 | * structures in the kernel provide points for (almost) every routine we have | ||
| 918 | * to override to avoid privileged instructions. */ | ||
| 919 | __init void lguest_init(void) | 933 | __init void lguest_init(void) |
| 920 | { | 934 | { |
| 921 | /* We're under lguest, paravirt is enabled, and we're running at | 935 | /* We're under lguest, paravirt is enabled, and we're running at |
| @@ -1003,9 +1017,9 @@ __init void lguest_init(void) | |||
| 1003 | * the normal data segment to get through booting. */ | 1017 | * the normal data segment to get through booting. */ |
| 1004 | asm volatile ("mov %0, %%fs" : : "r" (__KERNEL_DS) : "memory"); | 1018 | asm volatile ("mov %0, %%fs" : : "r" (__KERNEL_DS) : "memory"); |
| 1005 | 1019 | ||
| 1006 | /* The Host uses the top of the Guest's virtual address space for the | 1020 | /* The Host<->Guest Switcher lives at the top of our address space, and |
| 1007 | * Host<->Guest Switcher, and it tells us how big that is in | 1021 | * the Host told us how big it is when we made LGUEST_INIT hypercall: |
| 1008 | * lguest_data.reserve_mem, set up on the LGUEST_INIT hypercall. */ | 1022 | * it put the answer in lguest_data.reserve_mem */ |
| 1009 | reserve_top_address(lguest_data.reserve_mem); | 1023 | reserve_top_address(lguest_data.reserve_mem); |
| 1010 | 1024 | ||
| 1011 | /* If we don't initialize the lock dependency checker now, it crashes | 1025 | /* If we don't initialize the lock dependency checker now, it crashes |
| @@ -1027,6 +1041,7 @@ __init void lguest_init(void) | |||
| 1027 | /* Math is always hard! */ | 1041 | /* Math is always hard! */ |
| 1028 | new_cpu_data.hard_math = 1; | 1042 | new_cpu_data.hard_math = 1; |
| 1029 | 1043 | ||
| 1044 | /* We don't have features. We have puppies! Puppies! */ | ||
| 1030 | #ifdef CONFIG_X86_MCE | 1045 | #ifdef CONFIG_X86_MCE |
| 1031 | mce_disabled = 1; | 1046 | mce_disabled = 1; |
| 1032 | #endif | 1047 | #endif |
| @@ -1044,10 +1059,11 @@ __init void lguest_init(void) | |||
| 1044 | virtio_cons_early_init(early_put_chars); | 1059 | virtio_cons_early_init(early_put_chars); |
| 1045 | 1060 | ||
| 1046 | /* Last of all, we set the power management poweroff hook to point to | 1061 | /* Last of all, we set the power management poweroff hook to point to |
| 1047 | * the Guest routine to power off. */ | 1062 | * the Guest routine to power off, and the reboot hook to our restart |
| 1063 | * routine. */ | ||
| 1048 | pm_power_off = lguest_power_off; | 1064 | pm_power_off = lguest_power_off; |
| 1049 | |||
| 1050 | machine_ops.restart = lguest_restart; | 1065 | machine_ops.restart = lguest_restart; |
| 1066 | |||
| 1051 | /* Now we're set up, call start_kernel() in init/main.c and we proceed | 1067 | /* Now we're set up, call start_kernel() in init/main.c and we proceed |
| 1052 | * to boot as normal. It never returns. */ | 1068 | * to boot as normal. It never returns. */ |
| 1053 | start_kernel(); | 1069 | start_kernel(); |
diff --git a/arch/x86/lguest/i386_head.S b/arch/x86/lguest/i386_head.S index 95b6fbcded63..5c7cef34c9e7 100644 --- a/arch/x86/lguest/i386_head.S +++ b/arch/x86/lguest/i386_head.S | |||
| @@ -5,13 +5,20 @@ | |||
| 5 | #include <asm/thread_info.h> | 5 | #include <asm/thread_info.h> |
| 6 | #include <asm/processor-flags.h> | 6 | #include <asm/processor-flags.h> |
| 7 | 7 | ||
| 8 | /*G:020 This is where we begin: head.S notes that the boot header's platform | 8 | /*G:020 Our story starts with the kernel booting into startup_32 in |
| 9 | * type field is "1" (lguest), so calls us here. | 9 | * arch/x86/kernel/head_32.S. It expects a boot header, which is created by |
| 10 | * the bootloader (the Launcher in our case). | ||
| 11 | * | ||
| 12 | * The startup_32 function does very little: it clears the uninitialized global | ||
| 13 | * C variables which we expect to be zero (ie. BSS) and then copies the boot | ||
| 14 | * header and kernel command line somewhere safe. Finally it checks the | ||
| 15 | * 'hardware_subarch' field. This was introduced in 2.6.24 for lguest and Xen: | ||
| 16 | * if it's set to '1' (lguest's assigned number), then it calls us here. | ||
| 10 | * | 17 | * |
| 11 | * WARNING: be very careful here! We're running at addresses equal to physical | 18 | * WARNING: be very careful here! We're running at addresses equal to physical |
| 12 | * addesses (around 0), not above PAGE_OFFSET as most code expectes | 19 | * addesses (around 0), not above PAGE_OFFSET as most code expectes |
| 13 | * (eg. 0xC0000000). Jumps are relative, so they're OK, but we can't touch any | 20 | * (eg. 0xC0000000). Jumps are relative, so they're OK, but we can't touch any |
| 14 | * data. | 21 | * data without remembering to subtract __PAGE_OFFSET! |
| 15 | * | 22 | * |
| 16 | * The .section line puts this code in .init.text so it will be discarded after | 23 | * The .section line puts this code in .init.text so it will be discarded after |
| 17 | * boot. */ | 24 | * boot. */ |
| @@ -24,7 +31,7 @@ ENTRY(lguest_entry) | |||
| 24 | int $LGUEST_TRAP_ENTRY | 31 | int $LGUEST_TRAP_ENTRY |
| 25 | 32 | ||
| 26 | /* The Host put the toplevel pagetable in lguest_data.pgdir. The movsl | 33 | /* The Host put the toplevel pagetable in lguest_data.pgdir. The movsl |
| 27 | * instruction uses %esi implicitly as the source for the copy we' | 34 | * instruction uses %esi implicitly as the source for the copy we're |
| 28 | * about to do. */ | 35 | * about to do. */ |
| 29 | movl lguest_data - __PAGE_OFFSET + LGUEST_DATA_pgdir, %esi | 36 | movl lguest_data - __PAGE_OFFSET + LGUEST_DATA_pgdir, %esi |
| 30 | 37 | ||
diff --git a/arch/x86/mach-rdc321x/gpio.c b/arch/x86/mach-rdc321x/gpio.c index 031269163bd6..247f33d3a407 100644 --- a/arch/x86/mach-rdc321x/gpio.c +++ b/arch/x86/mach-rdc321x/gpio.c | |||
| @@ -1,91 +1,194 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2007, OpenWrt.org, Florian Fainelli <florian@openwrt.org> | 2 | * GPIO support for RDC SoC R3210/R8610 |
| 3 | * RDC321x architecture specific GPIO support | 3 | * |
| 4 | * Copyright (C) 2007, Florian Fainelli <florian@openwrt.org> | ||
| 5 | * Copyright (C) 2008, Volker Weiss <dev@tintuc.de> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, | ||
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | * GNU General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 4 | * | 20 | * |
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms of the GNU General Public License as published by the | ||
| 7 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 8 | * option) any later version. | ||
| 9 | */ | 21 | */ |
| 10 | 22 | ||
| 11 | #include <linux/autoconf.h> | 23 | |
| 12 | #include <linux/init.h> | 24 | #include <linux/spinlock.h> |
| 13 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 14 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 15 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 16 | #include <linux/delay.h> | ||
| 17 | 28 | ||
| 29 | #include <asm/gpio.h> | ||
| 18 | #include <asm/mach-rdc321x/rdc321x_defs.h> | 30 | #include <asm/mach-rdc321x/rdc321x_defs.h> |
| 19 | 31 | ||
| 20 | static inline int rdc_gpio_is_valid(unsigned gpio) | 32 | |
| 33 | /* spin lock to protect our private copy of GPIO data register plus | ||
| 34 | the access to PCI conf registers. */ | ||
| 35 | static DEFINE_SPINLOCK(gpio_lock); | ||
| 36 | |||
| 37 | /* copy of GPIO data registers */ | ||
| 38 | static u32 gpio_data_reg1; | ||
| 39 | static u32 gpio_data_reg2; | ||
| 40 | |||
| 41 | static u32 gpio_request_data[2]; | ||
| 42 | |||
| 43 | |||
| 44 | static inline void rdc321x_conf_write(unsigned addr, u32 value) | ||
| 21 | { | 45 | { |
| 22 | return (gpio <= RDC_MAX_GPIO); | 46 | outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR); |
| 47 | outl(value, RDC3210_CFGREG_DATA); | ||
| 23 | } | 48 | } |
| 24 | 49 | ||
| 25 | static unsigned int rdc_gpio_read(unsigned gpio) | 50 | static inline void rdc321x_conf_or(unsigned addr, u32 value) |
| 26 | { | 51 | { |
| 27 | unsigned int val; | 52 | outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR); |
| 28 | 53 | value |= inl(RDC3210_CFGREG_DATA); | |
| 29 | val = 0x80000000 | (7 << 11) | ((gpio&0x20?0x84:0x48)); | 54 | outl(value, RDC3210_CFGREG_DATA); |
| 30 | outl(val, RDC3210_CFGREG_ADDR); | ||
| 31 | udelay(10); | ||
| 32 | val = inl(RDC3210_CFGREG_DATA); | ||
| 33 | val |= (0x1 << (gpio & 0x1F)); | ||
| 34 | outl(val, RDC3210_CFGREG_DATA); | ||
| 35 | udelay(10); | ||
| 36 | val = 0x80000000 | (7 << 11) | ((gpio&0x20?0x88:0x4C)); | ||
| 37 | outl(val, RDC3210_CFGREG_ADDR); | ||
| 38 | udelay(10); | ||
| 39 | val = inl(RDC3210_CFGREG_DATA); | ||
| 40 | |||
| 41 | return val; | ||
| 42 | } | 55 | } |
| 43 | 56 | ||
| 44 | static void rdc_gpio_write(unsigned int val) | 57 | static inline u32 rdc321x_conf_read(unsigned addr) |
| 45 | { | 58 | { |
| 46 | if (val) { | 59 | outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR); |
| 47 | outl(val, RDC3210_CFGREG_DATA); | 60 | |
| 48 | udelay(10); | 61 | return inl(RDC3210_CFGREG_DATA); |
| 49 | } | ||
| 50 | } | 62 | } |
| 51 | 63 | ||
| 52 | int rdc_gpio_get_value(unsigned gpio) | 64 | /* configure pin as GPIO */ |
| 65 | static void rdc321x_configure_gpio(unsigned gpio) | ||
| 66 | { | ||
| 67 | unsigned long flags; | ||
| 68 | |||
| 69 | spin_lock_irqsave(&gpio_lock, flags); | ||
| 70 | rdc321x_conf_or(gpio < 32 | ||
| 71 | ? RDC321X_GPIO_CTRL_REG1 : RDC321X_GPIO_CTRL_REG2, | ||
| 72 | 1 << (gpio & 0x1f)); | ||
| 73 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
| 74 | } | ||
| 75 | |||
| 76 | /* initially setup the 2 copies of the gpio data registers. | ||
| 77 | This function must be called by the platform setup code. */ | ||
| 78 | void __init rdc321x_gpio_setup() | ||
| 79 | { | ||
| 80 | /* this might not be, what others (BIOS, bootloader, etc.) | ||
| 81 | wrote to these registers before, but it's a good guess. Still | ||
| 82 | better than just using 0xffffffff. */ | ||
| 83 | |||
| 84 | gpio_data_reg1 = rdc321x_conf_read(RDC321X_GPIO_DATA_REG1); | ||
| 85 | gpio_data_reg2 = rdc321x_conf_read(RDC321X_GPIO_DATA_REG2); | ||
| 86 | } | ||
| 87 | |||
| 88 | /* determine, if gpio number is valid */ | ||
| 89 | static inline int rdc321x_is_gpio(unsigned gpio) | ||
| 90 | { | ||
| 91 | return gpio <= RDC321X_MAX_GPIO; | ||
| 92 | } | ||
| 93 | |||
| 94 | /* request GPIO */ | ||
| 95 | int rdc_gpio_request(unsigned gpio, const char *label) | ||
| 53 | { | 96 | { |
| 54 | if (rdc_gpio_is_valid(gpio)) | 97 | unsigned long flags; |
| 55 | return (int)rdc_gpio_read(gpio); | 98 | |
| 56 | else | 99 | if (!rdc321x_is_gpio(gpio)) |
| 57 | return -EINVAL; | 100 | return -EINVAL; |
| 101 | |||
| 102 | spin_lock_irqsave(&gpio_lock, flags); | ||
| 103 | if (gpio_request_data[(gpio & 0x20) ? 1 : 0] & (1 << (gpio & 0x1f))) | ||
| 104 | goto inuse; | ||
| 105 | gpio_request_data[(gpio & 0x20) ? 1 : 0] |= (1 << (gpio & 0x1f)); | ||
| 106 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
| 107 | |||
| 108 | return 0; | ||
| 109 | inuse: | ||
| 110 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
| 111 | return -EINVAL; | ||
| 58 | } | 112 | } |
| 59 | EXPORT_SYMBOL(rdc_gpio_get_value); | 113 | EXPORT_SYMBOL(rdc_gpio_request); |
| 60 | 114 | ||
| 61 | void rdc_gpio_set_value(unsigned gpio, int value) | 115 | /* release previously-claimed GPIO */ |
| 116 | void rdc_gpio_free(unsigned gpio) | ||
| 62 | { | 117 | { |
| 63 | unsigned int val; | 118 | unsigned long flags; |
| 64 | 119 | ||
| 65 | if (!rdc_gpio_is_valid(gpio)) | 120 | if (!rdc321x_is_gpio(gpio)) |
| 66 | return; | 121 | return; |
| 67 | 122 | ||
| 68 | val = rdc_gpio_read(gpio); | 123 | spin_lock_irqsave(&gpio_lock, flags); |
| 124 | gpio_request_data[(gpio & 0x20) ? 1 : 0] &= ~(1 << (gpio & 0x1f)); | ||
| 125 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
| 126 | } | ||
| 127 | EXPORT_SYMBOL(rdc_gpio_free); | ||
| 128 | |||
| 129 | /* read GPIO pin */ | ||
| 130 | int rdc_gpio_get_value(unsigned gpio) | ||
| 131 | { | ||
| 132 | u32 reg; | ||
| 133 | unsigned long flags; | ||
| 134 | |||
| 135 | spin_lock_irqsave(&gpio_lock, flags); | ||
| 136 | reg = rdc321x_conf_read(gpio < 32 | ||
| 137 | ? RDC321X_GPIO_DATA_REG1 : RDC321X_GPIO_DATA_REG2); | ||
| 138 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
| 69 | 139 | ||
| 70 | if (value) | 140 | return (1 << (gpio & 0x1f)) & reg ? 1 : 0; |
| 71 | val &= ~(0x1 << (gpio & 0x1F)); | 141 | } |
| 72 | else | 142 | EXPORT_SYMBOL(rdc_gpio_get_value); |
| 73 | val |= (0x1 << (gpio & 0x1F)); | ||
| 74 | 143 | ||
| 75 | rdc_gpio_write(val); | 144 | /* set GPIO pin to value */ |
| 145 | void rdc_gpio_set_value(unsigned gpio, int value) | ||
| 146 | { | ||
| 147 | unsigned long flags; | ||
| 148 | u32 reg; | ||
| 149 | |||
| 150 | reg = 1 << (gpio & 0x1f); | ||
| 151 | if (gpio < 32) { | ||
| 152 | spin_lock_irqsave(&gpio_lock, flags); | ||
| 153 | if (value) | ||
| 154 | gpio_data_reg1 |= reg; | ||
| 155 | else | ||
| 156 | gpio_data_reg1 &= ~reg; | ||
| 157 | rdc321x_conf_write(RDC321X_GPIO_DATA_REG1, gpio_data_reg1); | ||
| 158 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
| 159 | } else { | ||
| 160 | spin_lock_irqsave(&gpio_lock, flags); | ||
| 161 | if (value) | ||
| 162 | gpio_data_reg2 |= reg; | ||
| 163 | else | ||
| 164 | gpio_data_reg2 &= ~reg; | ||
| 165 | rdc321x_conf_write(RDC321X_GPIO_DATA_REG2, gpio_data_reg2); | ||
| 166 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
| 167 | } | ||
| 76 | } | 168 | } |
| 77 | EXPORT_SYMBOL(rdc_gpio_set_value); | 169 | EXPORT_SYMBOL(rdc_gpio_set_value); |
| 78 | 170 | ||
| 171 | /* configure GPIO pin as input */ | ||
| 79 | int rdc_gpio_direction_input(unsigned gpio) | 172 | int rdc_gpio_direction_input(unsigned gpio) |
| 80 | { | 173 | { |
| 174 | if (!rdc321x_is_gpio(gpio)) | ||
| 175 | return -EINVAL; | ||
| 176 | |||
| 177 | rdc321x_configure_gpio(gpio); | ||
| 178 | |||
| 81 | return 0; | 179 | return 0; |
| 82 | } | 180 | } |
| 83 | EXPORT_SYMBOL(rdc_gpio_direction_input); | 181 | EXPORT_SYMBOL(rdc_gpio_direction_input); |
| 84 | 182 | ||
| 183 | /* configure GPIO pin as output and set value */ | ||
| 85 | int rdc_gpio_direction_output(unsigned gpio, int value) | 184 | int rdc_gpio_direction_output(unsigned gpio, int value) |
| 86 | { | 185 | { |
| 186 | if (!rdc321x_is_gpio(gpio)) | ||
| 187 | return -EINVAL; | ||
| 188 | |||
| 189 | gpio_set_value(gpio, value); | ||
| 190 | rdc321x_configure_gpio(gpio); | ||
| 191 | |||
| 87 | return 0; | 192 | return 0; |
| 88 | } | 193 | } |
| 89 | EXPORT_SYMBOL(rdc_gpio_direction_output); | 194 | EXPORT_SYMBOL(rdc_gpio_direction_output); |
| 90 | |||
| 91 | |||
diff --git a/arch/x86/mach-rdc321x/platform.c b/arch/x86/mach-rdc321x/platform.c index dda6024a5862..a037041817c7 100644 --- a/arch/x86/mach-rdc321x/platform.c +++ b/arch/x86/mach-rdc321x/platform.c | |||
| @@ -62,6 +62,8 @@ static struct platform_device *rdc321x_devs[] = { | |||
| 62 | 62 | ||
| 63 | static int __init rdc_board_setup(void) | 63 | static int __init rdc_board_setup(void) |
| 64 | { | 64 | { |
| 65 | rdc321x_gpio_setup(); | ||
| 66 | |||
| 65 | return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs)); | 67 | return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs)); |
| 66 | } | 68 | } |
| 67 | 69 | ||
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index c394ca0720b8..8e25e06ff730 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c | |||
| @@ -324,7 +324,6 @@ unsigned long __init setup_memory(void) | |||
| 324 | * this space and use it to adjust the boundary between ZONE_NORMAL | 324 | * this space and use it to adjust the boundary between ZONE_NORMAL |
| 325 | * and ZONE_HIGHMEM. | 325 | * and ZONE_HIGHMEM. |
| 326 | */ | 326 | */ |
| 327 | find_max_pfn(); | ||
| 328 | get_memcfg_numa(); | 327 | get_memcfg_numa(); |
| 329 | 328 | ||
| 330 | kva_pages = calculate_numa_remap_pages(); | 329 | kva_pages = calculate_numa_remap_pages(); |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index fdc667422df9..ec08d8389850 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -91,12 +91,10 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr, | |||
| 91 | int prefetch = 0; | 91 | int prefetch = 0; |
| 92 | unsigned char *max_instr; | 92 | unsigned char *max_instr; |
| 93 | 93 | ||
| 94 | #ifdef CONFIG_X86_32 | 94 | /* |
| 95 | if (!(__supported_pte_mask & _PAGE_NX)) | 95 | * If it was a exec (instruction fetch) fault on NX page, then |
| 96 | return 0; | 96 | * do not ignore the fault: |
| 97 | #endif | 97 | */ |
| 98 | |||
| 99 | /* If it was a exec fault on NX page, ignore */ | ||
| 100 | if (error_code & PF_INSTR) | 98 | if (error_code & PF_INSTR) |
| 101 | return 0; | 99 | return 0; |
| 102 | 100 | ||
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index 3d936f232704..9cf33d3ee5bc 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c | |||
| @@ -73,15 +73,15 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot) | |||
| 73 | { | 73 | { |
| 74 | enum fixed_addresses idx; | 74 | enum fixed_addresses idx; |
| 75 | unsigned long vaddr; | 75 | unsigned long vaddr; |
| 76 | /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ | ||
| 77 | |||
| 78 | debug_kmap_atomic_prot(type); | ||
| 79 | 76 | ||
| 77 | /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ | ||
| 80 | pagefault_disable(); | 78 | pagefault_disable(); |
| 81 | 79 | ||
| 82 | if (!PageHighMem(page)) | 80 | if (!PageHighMem(page)) |
| 83 | return page_address(page); | 81 | return page_address(page); |
| 84 | 82 | ||
| 83 | debug_kmap_atomic_prot(type); | ||
| 84 | |||
| 85 | idx = type + KM_TYPE_NR*smp_processor_id(); | 85 | idx = type + KM_TYPE_NR*smp_processor_id(); |
| 86 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); | 86 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); |
| 87 | BUG_ON(!pte_none(*(kmap_pte-idx))); | 87 | BUG_ON(!pte_none(*(kmap_pte-idx))); |
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c index 4fbafb4bc2f0..0b3d567e686d 100644 --- a/arch/x86/mm/hugetlbpage.c +++ b/arch/x86/mm/hugetlbpage.c | |||
| @@ -178,7 +178,7 @@ follow_huge_addr(struct mm_struct *mm, unsigned long address, int write) | |||
| 178 | 178 | ||
| 179 | page = &pte_page(*pte)[vpfn % (HPAGE_SIZE/PAGE_SIZE)]; | 179 | page = &pte_page(*pte)[vpfn % (HPAGE_SIZE/PAGE_SIZE)]; |
| 180 | 180 | ||
| 181 | WARN_ON(!PageCompound(page)); | 181 | WARN_ON(!PageHead(page)); |
| 182 | 182 | ||
| 183 | return page; | 183 | return page; |
| 184 | } | 184 | } |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 4afaba0ed722..794895c6dcc9 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -137,7 +137,11 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, | |||
| 137 | switch (mode) { | 137 | switch (mode) { |
| 138 | case IOR_MODE_UNCACHED: | 138 | case IOR_MODE_UNCACHED: |
| 139 | default: | 139 | default: |
| 140 | prot = PAGE_KERNEL_NOCACHE; | 140 | /* |
| 141 | * FIXME: we will use UC MINUS for now, as video fb drivers | ||
| 142 | * depend on it. Upcoming ioremap_wc() will fix this behavior. | ||
| 143 | */ | ||
| 144 | prot = PAGE_KERNEL_UC_MINUS; | ||
| 141 | break; | 145 | break; |
| 142 | case IOR_MODE_CACHED: | 146 | case IOR_MODE_CACHED: |
| 143 | prot = PAGE_KERNEL; | 147 | prot = PAGE_KERNEL; |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 14e48b5a94ba..7b79f6be4e7d 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
| @@ -771,7 +771,7 @@ static inline int change_page_attr_clear(unsigned long addr, int numpages, | |||
| 771 | int set_memory_uc(unsigned long addr, int numpages) | 771 | int set_memory_uc(unsigned long addr, int numpages) |
| 772 | { | 772 | { |
| 773 | return change_page_attr_set(addr, numpages, | 773 | return change_page_attr_set(addr, numpages, |
| 774 | __pgprot(_PAGE_PCD | _PAGE_PWT)); | 774 | __pgprot(_PAGE_PCD)); |
| 775 | } | 775 | } |
| 776 | EXPORT_SYMBOL(set_memory_uc); | 776 | EXPORT_SYMBOL(set_memory_uc); |
| 777 | 777 | ||
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 8b9ee27805fd..de4e6f05840b 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
| @@ -95,7 +95,7 @@ struct shared_info *HYPERVISOR_shared_info = (void *)&dummy_shared_info; | |||
| 95 | * | 95 | * |
| 96 | * 0: not available, 1: available | 96 | * 0: not available, 1: available |
| 97 | */ | 97 | */ |
| 98 | static int have_vcpu_info_placement = 0; | 98 | static int have_vcpu_info_placement = 1; |
| 99 | 99 | ||
| 100 | static void __init xen_vcpu_setup(int cpu) | 100 | static void __init xen_vcpu_setup(int cpu) |
| 101 | { | 101 | { |
| @@ -103,6 +103,7 @@ static void __init xen_vcpu_setup(int cpu) | |||
| 103 | int err; | 103 | int err; |
| 104 | struct vcpu_info *vcpup; | 104 | struct vcpu_info *vcpup; |
| 105 | 105 | ||
| 106 | BUG_ON(HYPERVISOR_shared_info == &dummy_shared_info); | ||
| 106 | per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; | 107 | per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; |
| 107 | 108 | ||
| 108 | if (!have_vcpu_info_placement) | 109 | if (!have_vcpu_info_placement) |
| @@ -805,33 +806,43 @@ static __init void xen_pagetable_setup_start(pgd_t *base) | |||
| 805 | PFN_DOWN(__pa(xen_start_info->pt_base))); | 806 | PFN_DOWN(__pa(xen_start_info->pt_base))); |
| 806 | } | 807 | } |
| 807 | 808 | ||
| 808 | static __init void xen_pagetable_setup_done(pgd_t *base) | 809 | static __init void setup_shared_info(void) |
| 809 | { | 810 | { |
| 810 | /* This will work as long as patching hasn't happened yet | ||
| 811 | (which it hasn't) */ | ||
| 812 | pv_mmu_ops.alloc_pt = xen_alloc_pt; | ||
| 813 | pv_mmu_ops.alloc_pd = xen_alloc_pd; | ||
| 814 | pv_mmu_ops.release_pt = xen_release_pt; | ||
| 815 | pv_mmu_ops.release_pd = xen_release_pt; | ||
| 816 | pv_mmu_ops.set_pte = xen_set_pte; | ||
| 817 | |||
| 818 | if (!xen_feature(XENFEAT_auto_translated_physmap)) { | 811 | if (!xen_feature(XENFEAT_auto_translated_physmap)) { |
| 812 | unsigned long addr = fix_to_virt(FIX_PARAVIRT_BOOTMAP); | ||
| 813 | |||
| 819 | /* | 814 | /* |
| 820 | * Create a mapping for the shared info page. | 815 | * Create a mapping for the shared info page. |
| 821 | * Should be set_fixmap(), but shared_info is a machine | 816 | * Should be set_fixmap(), but shared_info is a machine |
| 822 | * address with no corresponding pseudo-phys address. | 817 | * address with no corresponding pseudo-phys address. |
| 823 | */ | 818 | */ |
| 824 | set_pte_mfn(fix_to_virt(FIX_PARAVIRT_BOOTMAP), | 819 | set_pte_mfn(addr, |
| 825 | PFN_DOWN(xen_start_info->shared_info), | 820 | PFN_DOWN(xen_start_info->shared_info), |
| 826 | PAGE_KERNEL); | 821 | PAGE_KERNEL); |
| 827 | 822 | ||
| 828 | HYPERVISOR_shared_info = | 823 | HYPERVISOR_shared_info = (struct shared_info *)addr; |
| 829 | (struct shared_info *)fix_to_virt(FIX_PARAVIRT_BOOTMAP); | ||
| 830 | |||
| 831 | } else | 824 | } else |
| 832 | HYPERVISOR_shared_info = | 825 | HYPERVISOR_shared_info = |
| 833 | (struct shared_info *)__va(xen_start_info->shared_info); | 826 | (struct shared_info *)__va(xen_start_info->shared_info); |
| 834 | 827 | ||
| 828 | #ifndef CONFIG_SMP | ||
| 829 | /* In UP this is as good a place as any to set up shared info */ | ||
| 830 | xen_setup_vcpu_info_placement(); | ||
| 831 | #endif | ||
| 832 | } | ||
| 833 | |||
| 834 | static __init void xen_pagetable_setup_done(pgd_t *base) | ||
| 835 | { | ||
| 836 | /* This will work as long as patching hasn't happened yet | ||
| 837 | (which it hasn't) */ | ||
| 838 | pv_mmu_ops.alloc_pt = xen_alloc_pt; | ||
| 839 | pv_mmu_ops.alloc_pd = xen_alloc_pd; | ||
| 840 | pv_mmu_ops.release_pt = xen_release_pt; | ||
| 841 | pv_mmu_ops.release_pd = xen_release_pt; | ||
| 842 | pv_mmu_ops.set_pte = xen_set_pte; | ||
| 843 | |||
| 844 | setup_shared_info(); | ||
| 845 | |||
| 835 | /* Actually pin the pagetable down, but we can't set PG_pinned | 846 | /* Actually pin the pagetable down, but we can't set PG_pinned |
| 836 | yet because the page structures don't exist yet. */ | 847 | yet because the page structures don't exist yet. */ |
| 837 | { | 848 | { |
| @@ -1182,15 +1193,9 @@ asmlinkage void __init xen_start_kernel(void) | |||
| 1182 | x86_write_percpu(xen_cr3, __pa(pgd)); | 1193 | x86_write_percpu(xen_cr3, __pa(pgd)); |
| 1183 | x86_write_percpu(xen_current_cr3, __pa(pgd)); | 1194 | x86_write_percpu(xen_current_cr3, __pa(pgd)); |
| 1184 | 1195 | ||
| 1185 | #ifdef CONFIG_SMP | ||
| 1186 | /* Don't do the full vcpu_info placement stuff until we have a | 1196 | /* Don't do the full vcpu_info placement stuff until we have a |
| 1187 | possible map. */ | 1197 | possible map and a non-dummy shared_info. */ |
| 1188 | per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; | 1198 | per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; |
| 1189 | #else | ||
| 1190 | /* May as well do it now, since there's no good time to call | ||
| 1191 | it later on UP. */ | ||
| 1192 | xen_setup_vcpu_info_placement(); | ||
| 1193 | #endif | ||
| 1194 | 1199 | ||
| 1195 | pv_info.kernel_rpl = 1; | 1200 | pv_info.kernel_rpl = 1; |
| 1196 | if (xen_feature(XENFEAT_supervisor_mode_kernel)) | 1201 | if (xen_feature(XENFEAT_supervisor_mode_kernel)) |
diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S index 1a43b60c0c62..6b7190449d07 100644 --- a/arch/x86/xen/xen-asm.S +++ b/arch/x86/xen/xen-asm.S | |||
| @@ -33,12 +33,17 @@ | |||
| 33 | events, then enter the hypervisor to get them handled. | 33 | events, then enter the hypervisor to get them handled. |
| 34 | */ | 34 | */ |
| 35 | ENTRY(xen_irq_enable_direct) | 35 | ENTRY(xen_irq_enable_direct) |
| 36 | /* Clear mask and test pending */ | 36 | /* Unmask events */ |
| 37 | andw $0x00ff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending | 37 | movb $0, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask |
| 38 | |||
| 38 | /* Preempt here doesn't matter because that will deal with | 39 | /* Preempt here doesn't matter because that will deal with |
| 39 | any pending interrupts. The pending check may end up being | 40 | any pending interrupts. The pending check may end up being |
| 40 | run on the wrong CPU, but that doesn't hurt. */ | 41 | run on the wrong CPU, but that doesn't hurt. */ |
| 42 | |||
| 43 | /* Test for pending */ | ||
| 44 | testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending | ||
| 41 | jz 1f | 45 | jz 1f |
| 46 | |||
| 42 | 2: call check_events | 47 | 2: call check_events |
| 43 | 1: | 48 | 1: |
| 44 | ENDPATCH(xen_irq_enable_direct) | 49 | ENDPATCH(xen_irq_enable_direct) |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index e8e2d8869236..788da9781f80 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -1487,7 +1487,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, | |||
| 1487 | return 0; | 1487 | return 0; |
| 1488 | } | 1488 | } |
| 1489 | 1489 | ||
| 1490 | acpi_unlazy_tlb(smp_processor_id()); | ||
| 1491 | /* | 1490 | /* |
| 1492 | * Must be done before busmaster disable as we might need to | 1491 | * Must be done before busmaster disable as we might need to |
| 1493 | * access HPET ! | 1492 | * access HPET ! |
| @@ -1577,6 +1576,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
| 1577 | return 0; | 1576 | return 0; |
| 1578 | } | 1577 | } |
| 1579 | 1578 | ||
| 1579 | acpi_unlazy_tlb(smp_processor_id()); | ||
| 1580 | |||
| 1580 | /* Tell the scheduler that we are going deep-idle: */ | 1581 | /* Tell the scheduler that we are going deep-idle: */ |
| 1581 | sched_clock_idle_sleep_event(); | 1582 | sched_clock_idle_sleep_event(); |
| 1582 | /* | 1583 | /* |
| @@ -1692,7 +1693,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) | |||
| 1692 | switch (cx->type) { | 1693 | switch (cx->type) { |
| 1693 | case ACPI_STATE_C1: | 1694 | case ACPI_STATE_C1: |
| 1694 | state->flags |= CPUIDLE_FLAG_SHALLOW; | 1695 | state->flags |= CPUIDLE_FLAG_SHALLOW; |
| 1695 | state->flags |= CPUIDLE_FLAG_TIME_VALID; | 1696 | if (cx->entry_method == ACPI_CSTATE_FFH) |
| 1697 | state->flags |= CPUIDLE_FLAG_TIME_VALID; | ||
| 1698 | |||
| 1696 | state->enter = acpi_idle_enter_c1; | 1699 | state->enter = acpi_idle_enter_c1; |
| 1697 | dev->safe_state = state; | 1700 | dev->safe_state = state; |
| 1698 | break; | 1701 | break; |
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index a2cf3008ce6c..bcf2c70fca87 100644 --- a/drivers/acpi/sbshc.c +++ b/drivers/acpi/sbshc.c | |||
| @@ -130,7 +130,6 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, | |||
| 130 | goto end; | 130 | goto end; |
| 131 | } | 131 | } |
| 132 | smb_hc_write(hc, ACPI_SMB_COMMAND, command); | 132 | smb_hc_write(hc, ACPI_SMB_COMMAND, command); |
| 133 | smb_hc_write(hc, ACPI_SMB_COMMAND, command); | ||
| 134 | if (!(protocol & 0x01)) { | 133 | if (!(protocol & 0x01)) { |
| 135 | smb_hc_write(hc, ACPI_SMB_BLOCK_COUNT, length); | 134 | smb_hc_write(hc, ACPI_SMB_BLOCK_COUNT, length); |
| 136 | for (i = 0; i < length; ++i) | 135 | for (i = 0; i < length; ++i) |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 57570ac47803..e6ce262b5d44 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -39,20 +39,26 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias, | |||
| 39 | int size) | 39 | int size) |
| 40 | { | 40 | { |
| 41 | int len; | 41 | int len; |
| 42 | int count; | ||
| 42 | 43 | ||
| 43 | if (!acpi_dev->flags.hardware_id) | 44 | if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids) |
| 44 | return -ENODEV; | 45 | return -ENODEV; |
| 45 | 46 | ||
| 46 | len = snprintf(modalias, size, "acpi:%s:", | 47 | len = snprintf(modalias, size, "acpi:"); |
| 47 | acpi_dev->pnp.hardware_id); | ||
| 48 | if (len < 0 || len >= size) | ||
| 49 | return -EINVAL; | ||
| 50 | size -= len; | 48 | size -= len; |
| 51 | 49 | ||
| 50 | if (acpi_dev->flags.hardware_id) { | ||
| 51 | count = snprintf(&modalias[len], size, "%s:", | ||
| 52 | acpi_dev->pnp.hardware_id); | ||
| 53 | if (count < 0 || count >= size) | ||
| 54 | return -EINVAL; | ||
| 55 | len += count; | ||
| 56 | size -= count; | ||
| 57 | } | ||
| 58 | |||
| 52 | if (acpi_dev->flags.compatible_ids) { | 59 | if (acpi_dev->flags.compatible_ids) { |
| 53 | struct acpi_compatible_id_list *cid_list; | 60 | struct acpi_compatible_id_list *cid_list; |
| 54 | int i; | 61 | int i; |
| 55 | int count; | ||
| 56 | 62 | ||
| 57 | cid_list = acpi_dev->pnp.cid_list; | 63 | cid_list = acpi_dev->pnp.cid_list; |
| 58 | for (i = 0; i < cid_list->count; i++) { | 64 | for (i = 0; i < cid_list->count; i++) { |
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index d2f71a54726c..71183eea7906 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
| @@ -26,21 +26,6 @@ u8 sleep_states[ACPI_S_STATE_COUNT]; | |||
| 26 | 26 | ||
| 27 | #ifdef CONFIG_PM_SLEEP | 27 | #ifdef CONFIG_PM_SLEEP |
| 28 | static u32 acpi_target_sleep_state = ACPI_STATE_S0; | 28 | static u32 acpi_target_sleep_state = ACPI_STATE_S0; |
| 29 | static bool acpi_sleep_finish_wake_up; | ||
| 30 | |||
| 31 | /* | ||
| 32 | * ACPI 2.0 and later want us to execute _PTS after suspending devices, so we | ||
| 33 | * allow the user to request that behavior by using the 'acpi_new_pts_ordering' | ||
| 34 | * kernel command line option that causes the following variable to be set. | ||
| 35 | */ | ||
| 36 | static bool new_pts_ordering; | ||
| 37 | |||
| 38 | static int __init acpi_new_pts_ordering(char *str) | ||
| 39 | { | ||
| 40 | new_pts_ordering = true; | ||
| 41 | return 1; | ||
| 42 | } | ||
| 43 | __setup("acpi_new_pts_ordering", acpi_new_pts_ordering); | ||
| 44 | #endif | 29 | #endif |
| 45 | 30 | ||
| 46 | static int acpi_sleep_prepare(u32 acpi_state) | 31 | static int acpi_sleep_prepare(u32 acpi_state) |
| @@ -91,14 +76,6 @@ static int acpi_pm_begin(suspend_state_t pm_state) | |||
| 91 | 76 | ||
| 92 | if (sleep_states[acpi_state]) { | 77 | if (sleep_states[acpi_state]) { |
| 93 | acpi_target_sleep_state = acpi_state; | 78 | acpi_target_sleep_state = acpi_state; |
| 94 | if (new_pts_ordering) | ||
| 95 | return 0; | ||
| 96 | |||
| 97 | error = acpi_sleep_prepare(acpi_state); | ||
| 98 | if (error) | ||
| 99 | acpi_target_sleep_state = ACPI_STATE_S0; | ||
| 100 | else | ||
| 101 | acpi_sleep_finish_wake_up = true; | ||
| 102 | } else { | 79 | } else { |
| 103 | printk(KERN_ERR "ACPI does not support this state: %d\n", | 80 | printk(KERN_ERR "ACPI does not support this state: %d\n", |
| 104 | pm_state); | 81 | pm_state); |
| @@ -116,14 +93,11 @@ static int acpi_pm_begin(suspend_state_t pm_state) | |||
| 116 | 93 | ||
| 117 | static int acpi_pm_prepare(void) | 94 | static int acpi_pm_prepare(void) |
| 118 | { | 95 | { |
| 119 | if (new_pts_ordering) { | 96 | int error = acpi_sleep_prepare(acpi_target_sleep_state); |
| 120 | int error = acpi_sleep_prepare(acpi_target_sleep_state); | ||
| 121 | 97 | ||
| 122 | if (error) { | 98 | if (error) { |
| 123 | acpi_target_sleep_state = ACPI_STATE_S0; | 99 | acpi_target_sleep_state = ACPI_STATE_S0; |
| 124 | return error; | 100 | return error; |
| 125 | } | ||
| 126 | acpi_sleep_finish_wake_up = true; | ||
| 127 | } | 101 | } |
| 128 | 102 | ||
| 129 | return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT; | 103 | return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT; |
| @@ -212,7 +186,6 @@ static void acpi_pm_finish(void) | |||
| 212 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); | 186 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); |
| 213 | 187 | ||
| 214 | acpi_target_sleep_state = ACPI_STATE_S0; | 188 | acpi_target_sleep_state = ACPI_STATE_S0; |
| 215 | acpi_sleep_finish_wake_up = false; | ||
| 216 | 189 | ||
| 217 | #ifdef CONFIG_X86 | 190 | #ifdef CONFIG_X86 |
| 218 | if (init_8259A_after_S1) { | 191 | if (init_8259A_after_S1) { |
| @@ -229,11 +202,10 @@ static void acpi_pm_finish(void) | |||
| 229 | static void acpi_pm_end(void) | 202 | static void acpi_pm_end(void) |
| 230 | { | 203 | { |
| 231 | /* | 204 | /* |
| 232 | * This is necessary in case acpi_pm_finish() is not called directly | 205 | * This is necessary in case acpi_pm_finish() is not called during a |
| 233 | * during a failing transition to a sleep state. | 206 | * failing transition to a sleep state. |
| 234 | */ | 207 | */ |
| 235 | if (acpi_sleep_finish_wake_up) | 208 | acpi_target_sleep_state = ACPI_STATE_S0; |
| 236 | acpi_pm_finish(); | ||
| 237 | } | 209 | } |
| 238 | 210 | ||
| 239 | static int acpi_pm_state_valid(suspend_state_t pm_state) | 211 | static int acpi_pm_state_valid(suspend_state_t pm_state) |
| @@ -285,31 +257,18 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
| 285 | #ifdef CONFIG_HIBERNATION | 257 | #ifdef CONFIG_HIBERNATION |
| 286 | static int acpi_hibernation_begin(void) | 258 | static int acpi_hibernation_begin(void) |
| 287 | { | 259 | { |
| 288 | int error; | ||
| 289 | |||
| 290 | acpi_target_sleep_state = ACPI_STATE_S4; | 260 | acpi_target_sleep_state = ACPI_STATE_S4; |
| 291 | if (new_pts_ordering) | ||
| 292 | return 0; | ||
| 293 | 261 | ||
| 294 | error = acpi_sleep_prepare(ACPI_STATE_S4); | 262 | return 0; |
| 295 | if (error) | ||
| 296 | acpi_target_sleep_state = ACPI_STATE_S0; | ||
| 297 | else | ||
| 298 | acpi_sleep_finish_wake_up = true; | ||
| 299 | |||
| 300 | return error; | ||
| 301 | } | 263 | } |
| 302 | 264 | ||
| 303 | static int acpi_hibernation_prepare(void) | 265 | static int acpi_hibernation_prepare(void) |
| 304 | { | 266 | { |
| 305 | if (new_pts_ordering) { | 267 | int error = acpi_sleep_prepare(ACPI_STATE_S4); |
| 306 | int error = acpi_sleep_prepare(ACPI_STATE_S4); | ||
| 307 | 268 | ||
| 308 | if (error) { | 269 | if (error) { |
| 309 | acpi_target_sleep_state = ACPI_STATE_S0; | 270 | acpi_target_sleep_state = ACPI_STATE_S0; |
| 310 | return error; | 271 | return error; |
| 311 | } | ||
| 312 | acpi_sleep_finish_wake_up = true; | ||
| 313 | } | 272 | } |
| 314 | 273 | ||
| 315 | return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT; | 274 | return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT; |
| @@ -353,17 +312,15 @@ static void acpi_hibernation_finish(void) | |||
| 353 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); | 312 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); |
| 354 | 313 | ||
| 355 | acpi_target_sleep_state = ACPI_STATE_S0; | 314 | acpi_target_sleep_state = ACPI_STATE_S0; |
| 356 | acpi_sleep_finish_wake_up = false; | ||
| 357 | } | 315 | } |
| 358 | 316 | ||
| 359 | static void acpi_hibernation_end(void) | 317 | static void acpi_hibernation_end(void) |
| 360 | { | 318 | { |
| 361 | /* | 319 | /* |
| 362 | * This is necessary in case acpi_hibernation_finish() is not called | 320 | * This is necessary in case acpi_hibernation_finish() is not called |
| 363 | * directly during a failing transition to the sleep state. | 321 | * during a failing transition to the sleep state. |
| 364 | */ | 322 | */ |
| 365 | if (acpi_sleep_finish_wake_up) | 323 | acpi_target_sleep_state = ACPI_STATE_S0; |
| 366 | acpi_hibernation_finish(); | ||
| 367 | } | 324 | } |
| 368 | 325 | ||
| 369 | static int acpi_hibernation_pre_restore(void) | 326 | static int acpi_hibernation_pre_restore(void) |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c4248b37ff64..48519887f94a 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -972,7 +972,7 @@ static void ata_dev_disable_pm(struct ata_device *dev) | |||
| 972 | void ata_lpm_schedule(struct ata_port *ap, enum link_pm policy) | 972 | void ata_lpm_schedule(struct ata_port *ap, enum link_pm policy) |
| 973 | { | 973 | { |
| 974 | ap->pm_policy = policy; | 974 | ap->pm_policy = policy; |
| 975 | ap->link.eh_info.action |= ATA_EHI_LPM; | 975 | ap->link.eh_info.action |= ATA_EH_LPM; |
| 976 | ap->link.eh_info.flags |= ATA_EHI_NO_AUTOPSY; | 976 | ap->link.eh_info.flags |= ATA_EHI_NO_AUTOPSY; |
| 977 | ata_port_schedule_eh(ap); | 977 | ata_port_schedule_eh(ap); |
| 978 | } | 978 | } |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 681252fd8143..a5830329eda4 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
| @@ -2748,7 +2748,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
| 2748 | ehc->i.flags &= ~ATA_EHI_SETMODE; | 2748 | ehc->i.flags &= ~ATA_EHI_SETMODE; |
| 2749 | } | 2749 | } |
| 2750 | 2750 | ||
| 2751 | if (ehc->i.action & ATA_EHI_LPM) | 2751 | if (ehc->i.action & ATA_EH_LPM) |
| 2752 | ata_link_for_each_dev(dev, link) | 2752 | ata_link_for_each_dev(dev, link) |
| 2753 | ata_dev_enable_pm(dev, ap->pm_policy); | 2753 | ata_dev_enable_pm(dev, ap->pm_policy); |
| 2754 | 2754 | ||
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index 503245a1eafa..3988e44f4934 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
| @@ -269,7 +269,11 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio) | |||
| 269 | dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n", | 269 | dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n", |
| 270 | tmpbyte & 1, tmpbyte & 0x30); | 270 | tmpbyte & 1, tmpbyte & 0x30); |
| 271 | 271 | ||
| 272 | *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); | 272 | *try_mmio = 0; |
| 273 | #ifdef CONFIG_PPC | ||
| 274 | if (machine_is(cell)) | ||
| 275 | *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); | ||
| 276 | #endif | ||
| 273 | 277 | ||
| 274 | switch(tmpbyte & 0x30) { | 278 | switch(tmpbyte & 0x30) { |
| 275 | case 0x00: | 279 | case 0x00: |
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index bf31a0170a48..9a6537f14401 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c | |||
| @@ -133,6 +133,7 @@ int driver_add_kobj(struct device_driver *drv, struct kobject *kobj, | |||
| 133 | { | 133 | { |
| 134 | va_list args; | 134 | va_list args; |
| 135 | char *name; | 135 | char *name; |
| 136 | int ret; | ||
| 136 | 137 | ||
| 137 | va_start(args, fmt); | 138 | va_start(args, fmt); |
| 138 | name = kvasprintf(GFP_KERNEL, fmt, args); | 139 | name = kvasprintf(GFP_KERNEL, fmt, args); |
| @@ -141,7 +142,9 @@ int driver_add_kobj(struct device_driver *drv, struct kobject *kobj, | |||
| 141 | if (!name) | 142 | if (!name) |
| 142 | return -ENOMEM; | 143 | return -ENOMEM; |
| 143 | 144 | ||
| 144 | return kobject_add(kobj, &drv->p->kobj, "%s", name); | 145 | ret = kobject_add(kobj, &drv->p->kobj, "%s", name); |
| 146 | kfree(name); | ||
| 147 | return ret; | ||
| 145 | } | 148 | } |
| 146 | EXPORT_SYMBOL_GPL(driver_add_kobj); | 149 | EXPORT_SYMBOL_GPL(driver_add_kobj); |
| 147 | 150 | ||
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c index e5a0e97cfdda..141f4dfa0a11 100644 --- a/drivers/char/drm/ati_pcigart.c +++ b/drivers/char/drm/ati_pcigart.c | |||
| @@ -122,8 +122,9 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga | |||
| 122 | } else { | 122 | } else { |
| 123 | address = gart_info->addr; | 123 | address = gart_info->addr; |
| 124 | bus_address = gart_info->bus_addr; | 124 | bus_address = gart_info->bus_addr; |
| 125 | DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n", | 125 | DRM_DEBUG("PCI: Gart Table: VRAM %08LX mapped at %08lX\n", |
| 126 | bus_address, (unsigned long)address); | 126 | (unsigned long long)bus_address, |
| 127 | (unsigned long)address); | ||
| 127 | } | 128 | } |
| 128 | 129 | ||
| 129 | pci_gart = (u32 *) address; | 130 | pci_gart = (u32 *) address; |
| @@ -167,6 +168,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga | |||
| 167 | } | 168 | } |
| 168 | } | 169 | } |
| 169 | 170 | ||
| 171 | if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) | ||
| 172 | dma_sync_single_for_device(&dev->pdev->dev, | ||
| 173 | bus_address, | ||
| 174 | max_pages * sizeof(u32), | ||
| 175 | PCI_DMA_TODEVICE); | ||
| 176 | |||
| 170 | ret = 1; | 177 | ret = 1; |
| 171 | 178 | ||
| 172 | #if defined(__i386__) || defined(__x86_64__) | 179 | #if defined(__i386__) || defined(__x86_64__) |
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c index 26d8f675ed5d..b2b0f3d41714 100644 --- a/drivers/char/drm/drm_scatter.c +++ b/drivers/char/drm/drm_scatter.c | |||
| @@ -36,6 +36,15 @@ | |||
| 36 | 36 | ||
| 37 | #define DEBUG_SCATTER 0 | 37 | #define DEBUG_SCATTER 0 |
| 38 | 38 | ||
| 39 | static inline void *drm_vmalloc_dma(unsigned long size) | ||
| 40 | { | ||
| 41 | #if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE) | ||
| 42 | return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL | _PAGE_NO_CACHE); | ||
| 43 | #else | ||
| 44 | return vmalloc_32(size); | ||
| 45 | #endif | ||
| 46 | } | ||
| 47 | |||
| 39 | void drm_sg_cleanup(struct drm_sg_mem * entry) | 48 | void drm_sg_cleanup(struct drm_sg_mem * entry) |
| 40 | { | 49 | { |
| 41 | struct page *page; | 50 | struct page *page; |
| @@ -104,7 +113,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request) | |||
| 104 | } | 113 | } |
| 105 | memset((void *)entry->busaddr, 0, pages * sizeof(*entry->busaddr)); | 114 | memset((void *)entry->busaddr, 0, pages * sizeof(*entry->busaddr)); |
| 106 | 115 | ||
| 107 | entry->virtual = vmalloc_32(pages << PAGE_SHIFT); | 116 | entry->virtual = drm_vmalloc_dma(pages << PAGE_SHIFT); |
| 108 | if (!entry->virtual) { | 117 | if (!entry->virtual) { |
| 109 | drm_free(entry->busaddr, | 118 | drm_free(entry->busaddr, |
| 110 | entry->pages * sizeof(*entry->busaddr), DRM_MEM_PAGES); | 119 | entry->pages * sizeof(*entry->busaddr), DRM_MEM_PAGES); |
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 3d65c4dcd0c6..945df72a51a9 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c | |||
| @@ -54,13 +54,24 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma) | |||
| 54 | pgprot_val(tmp) |= _PAGE_NO_CACHE; | 54 | pgprot_val(tmp) |= _PAGE_NO_CACHE; |
| 55 | if (map_type == _DRM_REGISTERS) | 55 | if (map_type == _DRM_REGISTERS) |
| 56 | pgprot_val(tmp) |= _PAGE_GUARDED; | 56 | pgprot_val(tmp) |= _PAGE_GUARDED; |
| 57 | #endif | 57 | #elif defined(__ia64__) |
| 58 | #if defined(__ia64__) | ||
| 59 | if (efi_range_is_wc(vma->vm_start, vma->vm_end - | 58 | if (efi_range_is_wc(vma->vm_start, vma->vm_end - |
| 60 | vma->vm_start)) | 59 | vma->vm_start)) |
| 61 | tmp = pgprot_writecombine(tmp); | 60 | tmp = pgprot_writecombine(tmp); |
| 62 | else | 61 | else |
| 63 | tmp = pgprot_noncached(tmp); | 62 | tmp = pgprot_noncached(tmp); |
| 63 | #elif defined(__sparc__) | ||
| 64 | tmp = pgprot_noncached(tmp); | ||
| 65 | #endif | ||
| 66 | return tmp; | ||
| 67 | } | ||
| 68 | |||
| 69 | static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma) | ||
| 70 | { | ||
| 71 | pgprot_t tmp = vm_get_page_prot(vma->vm_flags); | ||
| 72 | |||
| 73 | #if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE) | ||
| 74 | tmp |= _PAGE_NO_CACHE; | ||
| 64 | #endif | 75 | #endif |
| 65 | return tmp; | 76 | return tmp; |
| 66 | } | 77 | } |
| @@ -603,9 +614,6 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) | |||
| 603 | offset = dev->driver->get_reg_ofs(dev); | 614 | offset = dev->driver->get_reg_ofs(dev); |
| 604 | vma->vm_flags |= VM_IO; /* not in core dump */ | 615 | vma->vm_flags |= VM_IO; /* not in core dump */ |
| 605 | vma->vm_page_prot = drm_io_prot(map->type, vma); | 616 | vma->vm_page_prot = drm_io_prot(map->type, vma); |
| 606 | #ifdef __sparc__ | ||
| 607 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | ||
| 608 | #endif | ||
| 609 | if (io_remap_pfn_range(vma, vma->vm_start, | 617 | if (io_remap_pfn_range(vma, vma->vm_start, |
| 610 | (map->offset + offset) >> PAGE_SHIFT, | 618 | (map->offset + offset) >> PAGE_SHIFT, |
| 611 | vma->vm_end - vma->vm_start, | 619 | vma->vm_end - vma->vm_start, |
| @@ -624,6 +632,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) | |||
| 624 | page_to_pfn(virt_to_page(map->handle)), | 632 | page_to_pfn(virt_to_page(map->handle)), |
| 625 | vma->vm_end - vma->vm_start, vma->vm_page_prot)) | 633 | vma->vm_end - vma->vm_start, vma->vm_page_prot)) |
| 626 | return -EAGAIN; | 634 | return -EAGAIN; |
| 635 | vma->vm_page_prot = drm_dma_prot(map->type, vma); | ||
| 627 | /* fall through to _DRM_SHM */ | 636 | /* fall through to _DRM_SHM */ |
| 628 | case _DRM_SHM: | 637 | case _DRM_SHM: |
| 629 | vma->vm_ops = &drm_vm_shm_ops; | 638 | vma->vm_ops = &drm_vm_shm_ops; |
| @@ -631,6 +640,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) | |||
| 631 | /* Don't let this area swap. Change when | 640 | /* Don't let this area swap. Change when |
| 632 | DRM_KERNEL advisory is supported. */ | 641 | DRM_KERNEL advisory is supported. */ |
| 633 | vma->vm_flags |= VM_RESERVED; | 642 | vma->vm_flags |= VM_RESERVED; |
| 643 | vma->vm_page_prot = drm_dma_prot(map->type, vma); | ||
| 634 | break; | 644 | break; |
| 635 | case _DRM_SCATTER_GATHER: | 645 | case _DRM_SCATTER_GATHER: |
| 636 | vma->vm_ops = &drm_vm_sg_ops; | 646 | vma->vm_ops = &drm_vm_sg_ops; |
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c index e9d6663bec73..a043bb12301a 100644 --- a/drivers/char/drm/i915_dma.c +++ b/drivers/char/drm/i915_dma.c | |||
| @@ -804,6 +804,9 @@ void i915_driver_lastclose(struct drm_device * dev) | |||
| 804 | { | 804 | { |
| 805 | drm_i915_private_t *dev_priv = dev->dev_private; | 805 | drm_i915_private_t *dev_priv = dev->dev_private; |
| 806 | 806 | ||
| 807 | if (!dev_priv) | ||
| 808 | return; | ||
| 809 | |||
| 807 | if (dev_priv->agp_heap) | 810 | if (dev_priv->agp_heap) |
| 808 | i915_mem_takedown(&(dev_priv->agp_heap)); | 811 | i915_mem_takedown(&(dev_priv->agp_heap)); |
| 809 | 812 | ||
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c index 0f4afc44245c..f535812e4057 100644 --- a/drivers/char/drm/r300_cmdbuf.c +++ b/drivers/char/drm/r300_cmdbuf.c | |||
| @@ -729,6 +729,47 @@ static void r300_discard_buffer(struct drm_device * dev, struct drm_buf * buf) | |||
| 729 | buf->used = 0; | 729 | buf->used = 0; |
| 730 | } | 730 | } |
| 731 | 731 | ||
| 732 | static void r300_cmd_wait(drm_radeon_private_t * dev_priv, | ||
| 733 | drm_r300_cmd_header_t header) | ||
| 734 | { | ||
| 735 | u32 wait_until; | ||
| 736 | RING_LOCALS; | ||
| 737 | |||
| 738 | if (!header.wait.flags) | ||
| 739 | return; | ||
| 740 | |||
| 741 | wait_until = 0; | ||
| 742 | |||
| 743 | switch(header.wait.flags) { | ||
| 744 | case R300_WAIT_2D: | ||
| 745 | wait_until = RADEON_WAIT_2D_IDLE; | ||
| 746 | break; | ||
| 747 | case R300_WAIT_3D: | ||
| 748 | wait_until = RADEON_WAIT_3D_IDLE; | ||
| 749 | break; | ||
| 750 | case R300_NEW_WAIT_2D_3D: | ||
| 751 | wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_3D_IDLE; | ||
| 752 | break; | ||
| 753 | case R300_NEW_WAIT_2D_2D_CLEAN: | ||
| 754 | wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_2D_IDLECLEAN; | ||
| 755 | break; | ||
| 756 | case R300_NEW_WAIT_3D_3D_CLEAN: | ||
| 757 | wait_until = RADEON_WAIT_3D_IDLE|RADEON_WAIT_3D_IDLECLEAN; | ||
| 758 | break; | ||
| 759 | case R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN: | ||
| 760 | wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_2D_IDLECLEAN; | ||
| 761 | wait_until |= RADEON_WAIT_3D_IDLE|RADEON_WAIT_3D_IDLECLEAN; | ||
| 762 | break; | ||
| 763 | default: | ||
| 764 | return; | ||
| 765 | } | ||
| 766 | |||
| 767 | BEGIN_RING(2); | ||
| 768 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
| 769 | OUT_RING(wait_until); | ||
| 770 | ADVANCE_RING(); | ||
| 771 | } | ||
| 772 | |||
| 732 | static int r300_scratch(drm_radeon_private_t *dev_priv, | 773 | static int r300_scratch(drm_radeon_private_t *dev_priv, |
| 733 | drm_radeon_kcmd_buffer_t *cmdbuf, | 774 | drm_radeon_kcmd_buffer_t *cmdbuf, |
| 734 | drm_r300_cmd_header_t header) | 775 | drm_r300_cmd_header_t header) |
| @@ -909,19 +950,8 @@ int r300_do_cp_cmdbuf(struct drm_device *dev, | |||
| 909 | break; | 950 | break; |
| 910 | 951 | ||
| 911 | case R300_CMD_WAIT: | 952 | case R300_CMD_WAIT: |
| 912 | /* simple enough, we can do it here */ | ||
| 913 | DRM_DEBUG("R300_CMD_WAIT\n"); | 953 | DRM_DEBUG("R300_CMD_WAIT\n"); |
| 914 | if (header.wait.flags == 0) | 954 | r300_cmd_wait(dev_priv, header); |
| 915 | break; /* nothing to do */ | ||
| 916 | |||
| 917 | { | ||
| 918 | RING_LOCALS; | ||
| 919 | |||
| 920 | BEGIN_RING(2); | ||
| 921 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
| 922 | OUT_RING((header.wait.flags & 0xf) << 14); | ||
| 923 | ADVANCE_RING(); | ||
| 924 | } | ||
| 925 | break; | 955 | break; |
| 926 | 956 | ||
| 927 | case R300_CMD_SCRATCH: | 957 | case R300_CMD_SCRATCH: |
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h index 71e5b21fad2c..aab82e121e07 100644 --- a/drivers/char/drm/radeon_drm.h +++ b/drivers/char/drm/radeon_drm.h | |||
| @@ -225,8 +225,20 @@ typedef union { | |||
| 225 | #define R300_CMD_WAIT 7 | 225 | #define R300_CMD_WAIT 7 |
| 226 | # define R300_WAIT_2D 0x1 | 226 | # define R300_WAIT_2D 0x1 |
| 227 | # define R300_WAIT_3D 0x2 | 227 | # define R300_WAIT_3D 0x2 |
| 228 | /* these two defines are DOING IT WRONG - however | ||
| 229 | * we have userspace which relies on using these. | ||
| 230 | * The wait interface is backwards compat new | ||
| 231 | * code should use the NEW_WAIT defines below | ||
| 232 | * THESE ARE NOT BIT FIELDS | ||
| 233 | */ | ||
| 228 | # define R300_WAIT_2D_CLEAN 0x3 | 234 | # define R300_WAIT_2D_CLEAN 0x3 |
| 229 | # define R300_WAIT_3D_CLEAN 0x4 | 235 | # define R300_WAIT_3D_CLEAN 0x4 |
| 236 | |||
| 237 | # define R300_NEW_WAIT_2D_3D 0x3 | ||
| 238 | # define R300_NEW_WAIT_2D_2D_CLEAN 0x4 | ||
| 239 | # define R300_NEW_WAIT_3D_3D_CLEAN 0x6 | ||
| 240 | # define R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN 0x8 | ||
| 241 | |||
| 230 | #define R300_CMD_SCRATCH 8 | 242 | #define R300_CMD_SCRATCH 8 |
| 231 | 243 | ||
| 232 | typedef union { | 244 | typedef union { |
diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c index 78b34fa7c89a..4af5286a36fb 100644 --- a/drivers/char/drm/radeon_mem.c +++ b/drivers/char/drm/radeon_mem.c | |||
| @@ -88,7 +88,7 @@ static struct mem_block *alloc_block(struct mem_block *heap, int size, | |||
| 88 | 88 | ||
| 89 | list_for_each(p, heap) { | 89 | list_for_each(p, heap) { |
| 90 | int start = (p->start + mask) & ~mask; | 90 | int start = (p->start + mask) & ~mask; |
| 91 | if (p->file_priv == 0 && start + size <= p->start + p->size) | 91 | if (p->file_priv == NULL && start + size <= p->start + p->size) |
| 92 | return split_block(p, start, size, file_priv); | 92 | return split_block(p, start, size, file_priv); |
| 93 | } | 93 | } |
| 94 | 94 | ||
| @@ -113,7 +113,7 @@ static void free_block(struct mem_block *p) | |||
| 113 | /* Assumes a single contiguous range. Needs a special file_priv in | 113 | /* Assumes a single contiguous range. Needs a special file_priv in |
| 114 | * 'heap' to stop it being subsumed. | 114 | * 'heap' to stop it being subsumed. |
| 115 | */ | 115 | */ |
| 116 | if (p->next->file_priv == 0) { | 116 | if (p->next->file_priv == NULL) { |
| 117 | struct mem_block *q = p->next; | 117 | struct mem_block *q = p->next; |
| 118 | p->size += q->size; | 118 | p->size += q->size; |
| 119 | p->next = q->next; | 119 | p->next = q->next; |
| @@ -121,7 +121,7 @@ static void free_block(struct mem_block *p) | |||
| 121 | drm_free(q, sizeof(*q), DRM_MEM_BUFS); | 121 | drm_free(q, sizeof(*q), DRM_MEM_BUFS); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | if (p->prev->file_priv == 0) { | 124 | if (p->prev->file_priv == NULL) { |
| 125 | struct mem_block *q = p->prev; | 125 | struct mem_block *q = p->prev; |
| 126 | q->size += p->size; | 126 | q->size += p->size; |
| 127 | q->next = p->next; | 127 | q->next = p->next; |
| @@ -174,7 +174,7 @@ void radeon_mem_release(struct drm_file *file_priv, struct mem_block *heap) | |||
| 174 | * 'heap' to stop it being subsumed. | 174 | * 'heap' to stop it being subsumed. |
| 175 | */ | 175 | */ |
| 176 | list_for_each(p, heap) { | 176 | list_for_each(p, heap) { |
| 177 | while (p->file_priv == 0 && p->next->file_priv == 0) { | 177 | while (p->file_priv == NULL && p->next->file_priv == NULL) { |
| 178 | struct mem_block *q = p->next; | 178 | struct mem_block *q = p->next; |
| 179 | p->size += q->size; | 179 | p->size += q->size; |
| 180 | p->next = q->next; | 180 | p->next = q->next; |
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index 46b2a1cc8b54..0c09409fa45d 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c | |||
| @@ -1183,7 +1183,7 @@ static int copy_from_read_buf(struct tty_struct *tty, | |||
| 1183 | return retval; | 1183 | return retval; |
| 1184 | } | 1184 | } |
| 1185 | 1185 | ||
| 1186 | extern ssize_t redirected_tty_write(struct file *, const char *, | 1186 | extern ssize_t redirected_tty_write(struct file *, const char __user *, |
| 1187 | size_t, loff_t *); | 1187 | size_t, loff_t *); |
| 1188 | 1188 | ||
| 1189 | /** | 1189 | /** |
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c index 6d0dc5f9b6bb..6a6843a0a674 100644 --- a/drivers/char/nozomi.c +++ b/drivers/char/nozomi.c | |||
| @@ -438,7 +438,7 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start, | |||
| 438 | u32 size_bytes) | 438 | u32 size_bytes) |
| 439 | { | 439 | { |
| 440 | u32 i = 0; | 440 | u32 i = 0; |
| 441 | const u32 *ptr = (__force u32 *) mem_addr_start; | 441 | const u32 __iomem *ptr = mem_addr_start; |
| 442 | u16 *buf16; | 442 | u16 *buf16; |
| 443 | 443 | ||
| 444 | if (unlikely(!ptr || !buf)) | 444 | if (unlikely(!ptr || !buf)) |
| @@ -448,11 +448,11 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start, | |||
| 448 | switch (size_bytes) { | 448 | switch (size_bytes) { |
| 449 | case 2: /* 2 bytes */ | 449 | case 2: /* 2 bytes */ |
| 450 | buf16 = (u16 *) buf; | 450 | buf16 = (u16 *) buf; |
| 451 | *buf16 = __le16_to_cpu(readw((void __iomem *)ptr)); | 451 | *buf16 = __le16_to_cpu(readw(ptr)); |
| 452 | goto out; | 452 | goto out; |
| 453 | break; | 453 | break; |
| 454 | case 4: /* 4 bytes */ | 454 | case 4: /* 4 bytes */ |
| 455 | *(buf) = __le32_to_cpu(readl((void __iomem *)ptr)); | 455 | *(buf) = __le32_to_cpu(readl(ptr)); |
| 456 | goto out; | 456 | goto out; |
| 457 | break; | 457 | break; |
| 458 | } | 458 | } |
| @@ -461,11 +461,11 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start, | |||
| 461 | if (size_bytes - i == 2) { | 461 | if (size_bytes - i == 2) { |
| 462 | /* Handle 2 bytes in the end */ | 462 | /* Handle 2 bytes in the end */ |
| 463 | buf16 = (u16 *) buf; | 463 | buf16 = (u16 *) buf; |
| 464 | *(buf16) = __le16_to_cpu(readw((void __iomem *)ptr)); | 464 | *(buf16) = __le16_to_cpu(readw(ptr)); |
| 465 | i += 2; | 465 | i += 2; |
| 466 | } else { | 466 | } else { |
| 467 | /* Read 4 bytes */ | 467 | /* Read 4 bytes */ |
| 468 | *(buf) = __le32_to_cpu(readl((void __iomem *)ptr)); | 468 | *(buf) = __le32_to_cpu(readl(ptr)); |
| 469 | i += 4; | 469 | i += 4; |
| 470 | } | 470 | } |
| 471 | buf++; | 471 | buf++; |
| @@ -484,7 +484,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf, | |||
| 484 | u32 size_bytes) | 484 | u32 size_bytes) |
| 485 | { | 485 | { |
| 486 | u32 i = 0; | 486 | u32 i = 0; |
| 487 | u32 *ptr = (__force u32 *) mem_addr_start; | 487 | u32 __iomem *ptr = mem_addr_start; |
| 488 | const u16 *buf16; | 488 | const u16 *buf16; |
| 489 | 489 | ||
| 490 | if (unlikely(!ptr || !buf)) | 490 | if (unlikely(!ptr || !buf)) |
| @@ -494,7 +494,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf, | |||
| 494 | switch (size_bytes) { | 494 | switch (size_bytes) { |
| 495 | case 2: /* 2 bytes */ | 495 | case 2: /* 2 bytes */ |
| 496 | buf16 = (const u16 *)buf; | 496 | buf16 = (const u16 *)buf; |
| 497 | writew(__cpu_to_le16(*buf16), (void __iomem *)ptr); | 497 | writew(__cpu_to_le16(*buf16), ptr); |
| 498 | return 2; | 498 | return 2; |
| 499 | break; | 499 | break; |
| 500 | case 1: /* | 500 | case 1: /* |
| @@ -502,7 +502,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf, | |||
| 502 | * so falling through.. | 502 | * so falling through.. |
| 503 | */ | 503 | */ |
| 504 | case 4: /* 4 bytes */ | 504 | case 4: /* 4 bytes */ |
| 505 | writel(__cpu_to_le32(*buf), (void __iomem *)ptr); | 505 | writel(__cpu_to_le32(*buf), ptr); |
| 506 | return 4; | 506 | return 4; |
| 507 | break; | 507 | break; |
| 508 | } | 508 | } |
| @@ -511,11 +511,11 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf, | |||
| 511 | if (size_bytes - i == 2) { | 511 | if (size_bytes - i == 2) { |
| 512 | /* 2 bytes */ | 512 | /* 2 bytes */ |
| 513 | buf16 = (const u16 *)buf; | 513 | buf16 = (const u16 *)buf; |
| 514 | writew(__cpu_to_le16(*buf16), (void __iomem *)ptr); | 514 | writew(__cpu_to_le16(*buf16), ptr); |
| 515 | i += 2; | 515 | i += 2; |
| 516 | } else { | 516 | } else { |
| 517 | /* 4 bytes */ | 517 | /* 4 bytes */ |
| 518 | writel(__cpu_to_le32(*buf), (void __iomem *)ptr); | 518 | writel(__cpu_to_le32(*buf), ptr); |
| 519 | i += 4; | 519 | i += 4; |
| 520 | } | 520 | } |
| 521 | buf++; | 521 | buf++; |
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index d73663a52324..fc555a90bb21 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c | |||
| @@ -67,7 +67,7 @@ static void cpuidle_idle_call(void) | |||
| 67 | /* enter the state and update stats */ | 67 | /* enter the state and update stats */ |
| 68 | dev->last_residency = target_state->enter(dev, target_state); | 68 | dev->last_residency = target_state->enter(dev, target_state); |
| 69 | dev->last_state = target_state; | 69 | dev->last_state = target_state; |
| 70 | target_state->time += dev->last_residency; | 70 | target_state->time += (unsigned long long)dev->last_residency; |
| 71 | target_state->usage++; | 71 | target_state->usage++; |
| 72 | 72 | ||
| 73 | /* give the governor an opportunity to reflect on the outcome */ | 73 | /* give the governor an opportunity to reflect on the outcome */ |
| @@ -224,7 +224,7 @@ static void poll_idle_init(struct cpuidle_device *dev) | |||
| 224 | state->exit_latency = 0; | 224 | state->exit_latency = 0; |
| 225 | state->target_residency = 0; | 225 | state->target_residency = 0; |
| 226 | state->power_usage = -1; | 226 | state->power_usage = -1; |
| 227 | state->flags = CPUIDLE_FLAG_POLL | CPUIDLE_FLAG_TIME_VALID; | 227 | state->flags = CPUIDLE_FLAG_POLL; |
| 228 | state->enter = poll_idle; | 228 | state->enter = poll_idle; |
| 229 | } | 229 | } |
| 230 | #else | 230 | #else |
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 69102ca05685..e949618b9be0 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c | |||
| @@ -218,6 +218,12 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ | |||
| 218 | return sprintf(buf, "%u\n", state->_name);\ | 218 | return sprintf(buf, "%u\n", state->_name);\ |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | #define define_show_state_ull_function(_name) \ | ||
| 222 | static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ | ||
| 223 | { \ | ||
| 224 | return sprintf(buf, "%llu\n", state->_name);\ | ||
| 225 | } | ||
| 226 | |||
| 221 | #define define_show_state_str_function(_name) \ | 227 | #define define_show_state_str_function(_name) \ |
| 222 | static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ | 228 | static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ |
| 223 | { \ | 229 | { \ |
| @@ -228,8 +234,8 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ | |||
| 228 | 234 | ||
| 229 | define_show_state_function(exit_latency) | 235 | define_show_state_function(exit_latency) |
| 230 | define_show_state_function(power_usage) | 236 | define_show_state_function(power_usage) |
| 231 | define_show_state_function(usage) | 237 | define_show_state_ull_function(usage) |
| 232 | define_show_state_function(time) | 238 | define_show_state_ull_function(time) |
| 233 | define_show_state_str_function(name) | 239 | define_show_state_str_function(name) |
| 234 | define_show_state_str_function(desc) | 240 | define_show_state_str_function(desc) |
| 235 | 241 | ||
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index 3110bf7014f7..81f3f950cd7d 100644 --- a/drivers/crypto/hifn_795x.c +++ b/drivers/crypto/hifn_795x.c | |||
| @@ -392,8 +392,8 @@ static atomic_t hifn_dev_number; | |||
| 392 | 392 | ||
| 393 | struct hifn_desc | 393 | struct hifn_desc |
| 394 | { | 394 | { |
| 395 | volatile u32 l; | 395 | volatile __le32 l; |
| 396 | volatile u32 p; | 396 | volatile __le32 p; |
| 397 | }; | 397 | }; |
| 398 | 398 | ||
| 399 | struct hifn_dma { | 399 | struct hifn_dma { |
| @@ -481,10 +481,10 @@ struct hifn_device | |||
| 481 | 481 | ||
| 482 | struct hifn_base_command | 482 | struct hifn_base_command |
| 483 | { | 483 | { |
| 484 | volatile u16 masks; | 484 | volatile __le16 masks; |
| 485 | volatile u16 session_num; | 485 | volatile __le16 session_num; |
| 486 | volatile u16 total_source_count; | 486 | volatile __le16 total_source_count; |
| 487 | volatile u16 total_dest_count; | 487 | volatile __le16 total_dest_count; |
| 488 | }; | 488 | }; |
| 489 | 489 | ||
| 490 | #define HIFN_BASE_CMD_COMP 0x0100 /* enable compression engine */ | 490 | #define HIFN_BASE_CMD_COMP 0x0100 /* enable compression engine */ |
| @@ -504,10 +504,10 @@ struct hifn_base_command | |||
| 504 | */ | 504 | */ |
| 505 | struct hifn_crypt_command | 505 | struct hifn_crypt_command |
| 506 | { | 506 | { |
| 507 | volatile u16 masks; | 507 | volatile __le16 masks; |
| 508 | volatile u16 header_skip; | 508 | volatile __le16 header_skip; |
| 509 | volatile u16 source_count; | 509 | volatile __le16 source_count; |
| 510 | volatile u16 reserved; | 510 | volatile __le16 reserved; |
| 511 | }; | 511 | }; |
| 512 | 512 | ||
| 513 | #define HIFN_CRYPT_CMD_ALG_MASK 0x0003 /* algorithm: */ | 513 | #define HIFN_CRYPT_CMD_ALG_MASK 0x0003 /* algorithm: */ |
| @@ -670,7 +670,7 @@ static inline u32 hifn_read_0(struct hifn_device *dev, u32 reg) | |||
| 670 | { | 670 | { |
| 671 | u32 ret; | 671 | u32 ret; |
| 672 | 672 | ||
| 673 | ret = readl((char *)(dev->bar[0]) + reg); | 673 | ret = readl(dev->bar[0] + reg); |
| 674 | 674 | ||
| 675 | return ret; | 675 | return ret; |
| 676 | } | 676 | } |
| @@ -679,19 +679,19 @@ static inline u32 hifn_read_1(struct hifn_device *dev, u32 reg) | |||
| 679 | { | 679 | { |
| 680 | u32 ret; | 680 | u32 ret; |
| 681 | 681 | ||
| 682 | ret = readl((char *)(dev->bar[1]) + reg); | 682 | ret = readl(dev->bar[1] + reg); |
| 683 | 683 | ||
| 684 | return ret; | 684 | return ret; |
| 685 | } | 685 | } |
| 686 | 686 | ||
| 687 | static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val) | 687 | static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val) |
| 688 | { | 688 | { |
| 689 | writel(val, (char *)(dev->bar[0]) + reg); | 689 | writel(val, dev->bar[0] + reg); |
| 690 | } | 690 | } |
| 691 | 691 | ||
| 692 | static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val) | 692 | static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val) |
| 693 | { | 693 | { |
| 694 | writel(val, (char *)(dev->bar[1]) + reg); | 694 | writel(val, dev->bar[1] + reg); |
| 695 | } | 695 | } |
| 696 | 696 | ||
| 697 | static void hifn_wait_puc(struct hifn_device *dev) | 697 | static void hifn_wait_puc(struct hifn_device *dev) |
diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h index fddd6aee2a63..6faf07ba0d0e 100644 --- a/drivers/dma/fsldma.h +++ b/drivers/dma/fsldma.h | |||
| @@ -75,12 +75,15 @@ | |||
| 75 | #define FSL_DMA_DGSR_EOSI 0x02 | 75 | #define FSL_DMA_DGSR_EOSI 0x02 |
| 76 | #define FSL_DMA_DGSR_EOLSI 0x01 | 76 | #define FSL_DMA_DGSR_EOLSI 0x01 |
| 77 | 77 | ||
| 78 | typedef u64 __bitwise v64; | ||
| 79 | typedef u32 __bitwise v32; | ||
| 80 | |||
| 78 | struct fsl_dma_ld_hw { | 81 | struct fsl_dma_ld_hw { |
| 79 | u64 __bitwise src_addr; | 82 | v64 src_addr; |
| 80 | u64 __bitwise dst_addr; | 83 | v64 dst_addr; |
| 81 | u64 __bitwise next_ln_addr; | 84 | v64 next_ln_addr; |
| 82 | u32 __bitwise count; | 85 | v32 count; |
| 83 | u32 __bitwise reserve; | 86 | v32 reserve; |
| 84 | } __attribute__((aligned(32))); | 87 | } __attribute__((aligned(32))); |
| 85 | 88 | ||
| 86 | struct fsl_desc_sw { | 89 | struct fsl_desc_sw { |
| @@ -92,13 +95,13 @@ struct fsl_desc_sw { | |||
| 92 | } __attribute__((aligned(32))); | 95 | } __attribute__((aligned(32))); |
| 93 | 96 | ||
| 94 | struct fsl_dma_chan_regs { | 97 | struct fsl_dma_chan_regs { |
| 95 | u32 __bitwise mr; /* 0x00 - Mode Register */ | 98 | u32 mr; /* 0x00 - Mode Register */ |
| 96 | u32 __bitwise sr; /* 0x04 - Status Register */ | 99 | u32 sr; /* 0x04 - Status Register */ |
| 97 | u64 __bitwise cdar; /* 0x08 - Current descriptor address register */ | 100 | u64 cdar; /* 0x08 - Current descriptor address register */ |
| 98 | u64 __bitwise sar; /* 0x10 - Source Address Register */ | 101 | u64 sar; /* 0x10 - Source Address Register */ |
| 99 | u64 __bitwise dar; /* 0x18 - Destination Address Register */ | 102 | u64 dar; /* 0x18 - Destination Address Register */ |
| 100 | u32 __bitwise bcr; /* 0x20 - Byte Count Register */ | 103 | u32 bcr; /* 0x20 - Byte Count Register */ |
| 101 | u64 __bitwise ndar; /* 0x24 - Next Descriptor Address Register */ | 104 | u64 ndar; /* 0x24 - Next Descriptor Address Register */ |
| 102 | }; | 105 | }; |
| 103 | 106 | ||
| 104 | struct fsl_dma_chan; | 107 | struct fsl_dma_chan; |
| @@ -151,25 +154,27 @@ struct fsl_dma_chan { | |||
| 151 | #ifndef __powerpc64__ | 154 | #ifndef __powerpc64__ |
| 152 | static u64 in_be64(const u64 __iomem *addr) | 155 | static u64 in_be64(const u64 __iomem *addr) |
| 153 | { | 156 | { |
| 154 | return ((u64)in_be32((u32 *)addr) << 32) | (in_be32((u32 *)addr + 1)); | 157 | return ((u64)in_be32((u32 __iomem *)addr) << 32) | |
| 158 | (in_be32((u32 __iomem *)addr + 1)); | ||
| 155 | } | 159 | } |
| 156 | 160 | ||
| 157 | static void out_be64(u64 __iomem *addr, u64 val) | 161 | static void out_be64(u64 __iomem *addr, u64 val) |
| 158 | { | 162 | { |
| 159 | out_be32((u32 *)addr, val >> 32); | 163 | out_be32((u32 __iomem *)addr, val >> 32); |
| 160 | out_be32((u32 *)addr + 1, (u32)val); | 164 | out_be32((u32 __iomem *)addr + 1, (u32)val); |
| 161 | } | 165 | } |
| 162 | 166 | ||
| 163 | /* There is no asm instructions for 64 bits reverse loads and stores */ | 167 | /* There is no asm instructions for 64 bits reverse loads and stores */ |
| 164 | static u64 in_le64(const u64 __iomem *addr) | 168 | static u64 in_le64(const u64 __iomem *addr) |
| 165 | { | 169 | { |
| 166 | return ((u64)in_le32((u32 *)addr + 1) << 32) | (in_le32((u32 *)addr)); | 170 | return ((u64)in_le32((u32 __iomem *)addr + 1) << 32) | |
| 171 | (in_le32((u32 __iomem *)addr)); | ||
| 167 | } | 172 | } |
| 168 | 173 | ||
| 169 | static void out_le64(u64 __iomem *addr, u64 val) | 174 | static void out_le64(u64 __iomem *addr, u64 val) |
| 170 | { | 175 | { |
| 171 | out_le32((u32 *)addr + 1, val >> 32); | 176 | out_le32((u32 __iomem *)addr + 1, val >> 32); |
| 172 | out_le32((u32 *)addr, (u32)val); | 177 | out_le32((u32 __iomem *)addr, (u32)val); |
| 173 | } | 178 | } |
| 174 | #endif | 179 | #endif |
| 175 | 180 | ||
| @@ -182,9 +187,11 @@ static void out_le64(u64 __iomem *addr, u64 val) | |||
| 182 | 187 | ||
| 183 | #define DMA_TO_CPU(fsl_chan, d, width) \ | 188 | #define DMA_TO_CPU(fsl_chan, d, width) \ |
| 184 | (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ? \ | 189 | (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ? \ |
| 185 | be##width##_to_cpu(d) : le##width##_to_cpu(d)) | 190 | be##width##_to_cpu((__force __be##width)(v##width)d) : \ |
| 191 | le##width##_to_cpu((__force __le##width)(v##width)d)) | ||
| 186 | #define CPU_TO_DMA(fsl_chan, c, width) \ | 192 | #define CPU_TO_DMA(fsl_chan, c, width) \ |
| 187 | (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ? \ | 193 | (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ? \ |
| 188 | cpu_to_be##width(c) : cpu_to_le##width(c)) | 194 | (__force v##width)cpu_to_be##width(c) : \ |
| 195 | (__force v##width)cpu_to_le##width(c)) | ||
| 189 | 196 | ||
| 190 | #endif /* __DMA_FSLDMA_H */ | 197 | #endif /* __DMA_FSLDMA_H */ |
diff --git a/drivers/dma/ioat_dca.c b/drivers/dma/ioat_dca.c index 0fa8a98051a8..9e922760b7ff 100644 --- a/drivers/dma/ioat_dca.c +++ b/drivers/dma/ioat_dca.c | |||
| @@ -98,7 +98,7 @@ struct ioat_dca_slot { | |||
| 98 | 98 | ||
| 99 | struct ioat_dca_priv { | 99 | struct ioat_dca_priv { |
| 100 | void __iomem *iobase; | 100 | void __iomem *iobase; |
| 101 | void *dca_base; | 101 | void __iomem *dca_base; |
| 102 | int max_requesters; | 102 | int max_requesters; |
| 103 | int requester_count; | 103 | int requester_count; |
| 104 | u8 tag_map[IOAT_TAG_MAP_LEN]; | 104 | u8 tag_map[IOAT_TAG_MAP_LEN]; |
| @@ -338,7 +338,7 @@ static struct dca_ops ioat2_dca_ops = { | |||
| 338 | .get_tag = ioat2_dca_get_tag, | 338 | .get_tag = ioat2_dca_get_tag, |
| 339 | }; | 339 | }; |
| 340 | 340 | ||
| 341 | static int ioat2_dca_count_dca_slots(void *iobase, u16 dca_offset) | 341 | static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset) |
| 342 | { | 342 | { |
| 343 | int slots = 0; | 343 | int slots = 0; |
| 344 | u32 req; | 344 | u32 req; |
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index 5c85670e2d16..f942ecdd47c8 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
| @@ -1367,7 +1367,8 @@ w83781d_isa_probe(struct platform_device *pdev) | |||
| 1367 | 1367 | ||
| 1368 | /* Reserve the ISA region */ | 1368 | /* Reserve the ISA region */ |
| 1369 | res = platform_get_resource(pdev, IORESOURCE_IO, 0); | 1369 | res = platform_get_resource(pdev, IORESOURCE_IO, 0); |
| 1370 | if (!request_region(res->start, W83781D_EXTENT, "w83781d")) { | 1370 | if (!request_region(res->start + W83781D_ADDR_REG_OFFSET, 2, |
| 1371 | "w83781d")) { | ||
| 1371 | err = -EBUSY; | 1372 | err = -EBUSY; |
| 1372 | goto exit; | 1373 | goto exit; |
| 1373 | } | 1374 | } |
| @@ -1415,7 +1416,7 @@ w83781d_isa_probe(struct platform_device *pdev) | |||
| 1415 | device_remove_file(&pdev->dev, &dev_attr_name); | 1416 | device_remove_file(&pdev->dev, &dev_attr_name); |
| 1416 | kfree(data); | 1417 | kfree(data); |
| 1417 | exit_release_region: | 1418 | exit_release_region: |
| 1418 | release_region(res->start, W83781D_EXTENT); | 1419 | release_region(res->start + W83781D_ADDR_REG_OFFSET, 2); |
| 1419 | exit: | 1420 | exit: |
| 1420 | return err; | 1421 | return err; |
| 1421 | } | 1422 | } |
| @@ -1429,7 +1430,7 @@ w83781d_isa_remove(struct platform_device *pdev) | |||
| 1429 | sysfs_remove_group(&pdev->dev.kobj, &w83781d_group); | 1430 | sysfs_remove_group(&pdev->dev.kobj, &w83781d_group); |
| 1430 | sysfs_remove_group(&pdev->dev.kobj, &w83781d_group_opt); | 1431 | sysfs_remove_group(&pdev->dev.kobj, &w83781d_group_opt); |
| 1431 | device_remove_file(&pdev->dev, &dev_attr_name); | 1432 | device_remove_file(&pdev->dev, &dev_attr_name); |
| 1432 | release_region(data->client.addr, W83781D_EXTENT); | 1433 | release_region(data->client.addr + W83781D_ADDR_REG_OFFSET, 2); |
| 1433 | kfree(data); | 1434 | kfree(data); |
| 1434 | 1435 | ||
| 1435 | return 0; | 1436 | return 0; |
| @@ -1797,8 +1798,17 @@ w83781d_isa_found(unsigned short address) | |||
| 1797 | { | 1798 | { |
| 1798 | int val, save, found = 0; | 1799 | int val, save, found = 0; |
| 1799 | 1800 | ||
| 1800 | if (!request_region(address, W83781D_EXTENT, "w83781d")) | 1801 | /* We have to request the region in two parts because some |
| 1802 | boards declare base+4 to base+7 as a PNP device */ | ||
| 1803 | if (!request_region(address, 4, "w83781d")) { | ||
| 1804 | pr_debug("w83781d: Failed to request low part of region\n"); | ||
| 1801 | return 0; | 1805 | return 0; |
| 1806 | } | ||
| 1807 | if (!request_region(address + 4, 4, "w83781d")) { | ||
| 1808 | pr_debug("w83781d: Failed to request high part of region\n"); | ||
| 1809 | release_region(address, 4); | ||
| 1810 | return 0; | ||
| 1811 | } | ||
| 1802 | 1812 | ||
| 1803 | #define REALLY_SLOW_IO | 1813 | #define REALLY_SLOW_IO |
| 1804 | /* We need the timeouts for at least some W83781D-like | 1814 | /* We need the timeouts for at least some W83781D-like |
| @@ -1871,7 +1881,8 @@ w83781d_isa_found(unsigned short address) | |||
| 1871 | val == 0x30 ? "W83782D" : "W83781D", (int)address); | 1881 | val == 0x30 ? "W83782D" : "W83781D", (int)address); |
| 1872 | 1882 | ||
| 1873 | release: | 1883 | release: |
| 1874 | release_region(address, W83781D_EXTENT); | 1884 | release_region(address + 4, 4); |
| 1885 | release_region(address, 4); | ||
| 1875 | return found; | 1886 | return found; |
| 1876 | } | 1887 | } |
| 1877 | 1888 | ||
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index c419266234a7..01b92208f09d 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
| @@ -595,6 +595,7 @@ u8 eighty_ninty_three (ide_drive_t *drive) | |||
| 595 | 595 | ||
| 596 | /* | 596 | /* |
| 597 | * FIXME: | 597 | * FIXME: |
| 598 | * - change master/slave IDENTIFY order | ||
| 598 | * - force bit13 (80c cable present) check also for !ivb devices | 599 | * - force bit13 (80c cable present) check also for !ivb devices |
| 599 | * (unless the slave device is pre-ATA3) | 600 | * (unless the slave device is pre-ATA3) |
| 600 | */ | 601 | */ |
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 194ecb0049eb..47a114927c31 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -774,9 +774,10 @@ static int ide_probe_port(ide_hwif_t *hwif) | |||
| 774 | printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name); | 774 | printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name); |
| 775 | 775 | ||
| 776 | /* | 776 | /* |
| 777 | * Need to probe slave device first to make it release PDIAG-. | 777 | * Second drive should only exist if first drive was found, |
| 778 | * but a lot of cdrom drives are configured as single slaves. | ||
| 778 | */ | 779 | */ |
| 779 | for (unit = MAX_DRIVES - 1; unit >= 0; unit--) { | 780 | for (unit = 0; unit < MAX_DRIVES; ++unit) { |
| 780 | ide_drive_t *drive = &hwif->drives[unit]; | 781 | ide_drive_t *drive = &hwif->drives[unit]; |
| 781 | drive->dn = (hwif->channel ? 2 : 0) + unit; | 782 | drive->dn = (hwif->channel ? 2 : 0) + unit; |
| 782 | (void) probe_for_drive(drive); | 783 | (void) probe_for_drive(drive); |
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index a58ad8a470f9..781ea5950373 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c | |||
| @@ -154,7 +154,7 @@ static void addr_send_arp(struct sockaddr_in *dst_in) | |||
| 154 | { | 154 | { |
| 155 | struct rtable *rt; | 155 | struct rtable *rt; |
| 156 | struct flowi fl; | 156 | struct flowi fl; |
| 157 | u32 dst_ip = dst_in->sin_addr.s_addr; | 157 | __be32 dst_ip = dst_in->sin_addr.s_addr; |
| 158 | 158 | ||
| 159 | memset(&fl, 0, sizeof fl); | 159 | memset(&fl, 0, sizeof fl); |
| 160 | fl.nl_u.ip4_u.daddr = dst_ip; | 160 | fl.nl_u.ip4_u.daddr = dst_ip; |
| @@ -169,8 +169,8 @@ static int addr_resolve_remote(struct sockaddr_in *src_in, | |||
| 169 | struct sockaddr_in *dst_in, | 169 | struct sockaddr_in *dst_in, |
| 170 | struct rdma_dev_addr *addr) | 170 | struct rdma_dev_addr *addr) |
| 171 | { | 171 | { |
| 172 | u32 src_ip = src_in->sin_addr.s_addr; | 172 | __be32 src_ip = src_in->sin_addr.s_addr; |
| 173 | u32 dst_ip = dst_in->sin_addr.s_addr; | 173 | __be32 dst_ip = dst_in->sin_addr.s_addr; |
| 174 | struct flowi fl; | 174 | struct flowi fl; |
| 175 | struct rtable *rt; | 175 | struct rtable *rt; |
| 176 | struct neighbour *neigh; | 176 | struct neighbour *neigh; |
| @@ -257,7 +257,7 @@ static int addr_resolve_local(struct sockaddr_in *src_in, | |||
| 257 | struct rdma_dev_addr *addr) | 257 | struct rdma_dev_addr *addr) |
| 258 | { | 258 | { |
| 259 | struct net_device *dev; | 259 | struct net_device *dev; |
| 260 | u32 src_ip = src_in->sin_addr.s_addr; | 260 | __be32 src_ip = src_in->sin_addr.s_addr; |
| 261 | __be32 dst_ip = dst_in->sin_addr.s_addr; | 261 | __be32 dst_ip = dst_in->sin_addr.s_addr; |
| 262 | int ret; | 262 | int ret; |
| 263 | 263 | ||
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 4df405157086..faa7ce318a6d 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c | |||
| @@ -393,7 +393,7 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv) | |||
| 393 | spin_unlock_irqrestore(&cm.lock, flags); | 393 | spin_unlock_irqrestore(&cm.lock, flags); |
| 394 | } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) ); | 394 | } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) ); |
| 395 | 395 | ||
| 396 | cm_id_priv->id.local_id = (__force __be32) (id ^ cm.random_id_operand); | 396 | cm_id_priv->id.local_id = (__force __be32)id ^ cm.random_id_operand; |
| 397 | return ret; | 397 | return ret; |
| 398 | } | 398 | } |
| 399 | 399 | ||
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 34507daaf9b6..d81c156a22b4 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c | |||
| @@ -168,15 +168,15 @@ struct cma_work { | |||
| 168 | union cma_ip_addr { | 168 | union cma_ip_addr { |
| 169 | struct in6_addr ip6; | 169 | struct in6_addr ip6; |
| 170 | struct { | 170 | struct { |
| 171 | __u32 pad[3]; | 171 | __be32 pad[3]; |
| 172 | __u32 addr; | 172 | __be32 addr; |
| 173 | } ip4; | 173 | } ip4; |
| 174 | }; | 174 | }; |
| 175 | 175 | ||
| 176 | struct cma_hdr { | 176 | struct cma_hdr { |
| 177 | u8 cma_version; | 177 | u8 cma_version; |
| 178 | u8 ip_version; /* IP version: 7:4 */ | 178 | u8 ip_version; /* IP version: 7:4 */ |
| 179 | __u16 port; | 179 | __be16 port; |
| 180 | union cma_ip_addr src_addr; | 180 | union cma_ip_addr src_addr; |
| 181 | union cma_ip_addr dst_addr; | 181 | union cma_ip_addr dst_addr; |
| 182 | }; | 182 | }; |
| @@ -186,8 +186,8 @@ struct sdp_hh { | |||
| 186 | u8 sdp_version; /* Major version: 7:4 */ | 186 | u8 sdp_version; /* Major version: 7:4 */ |
| 187 | u8 ip_version; /* IP version: 7:4 */ | 187 | u8 ip_version; /* IP version: 7:4 */ |
| 188 | u8 sdp_specific1[10]; | 188 | u8 sdp_specific1[10]; |
| 189 | __u16 port; | 189 | __be16 port; |
| 190 | __u16 sdp_specific2; | 190 | __be16 sdp_specific2; |
| 191 | union cma_ip_addr src_addr; | 191 | union cma_ip_addr src_addr; |
| 192 | union cma_ip_addr dst_addr; | 192 | union cma_ip_addr dst_addr; |
| 193 | }; | 193 | }; |
| @@ -663,7 +663,7 @@ static inline int cma_any_port(struct sockaddr *addr) | |||
| 663 | } | 663 | } |
| 664 | 664 | ||
| 665 | static int cma_get_net_info(void *hdr, enum rdma_port_space ps, | 665 | static int cma_get_net_info(void *hdr, enum rdma_port_space ps, |
| 666 | u8 *ip_ver, __u16 *port, | 666 | u8 *ip_ver, __be16 *port, |
| 667 | union cma_ip_addr **src, union cma_ip_addr **dst) | 667 | union cma_ip_addr **src, union cma_ip_addr **dst) |
| 668 | { | 668 | { |
| 669 | switch (ps) { | 669 | switch (ps) { |
| @@ -695,7 +695,7 @@ static int cma_get_net_info(void *hdr, enum rdma_port_space ps, | |||
| 695 | 695 | ||
| 696 | static void cma_save_net_info(struct rdma_addr *addr, | 696 | static void cma_save_net_info(struct rdma_addr *addr, |
| 697 | struct rdma_addr *listen_addr, | 697 | struct rdma_addr *listen_addr, |
| 698 | u8 ip_ver, __u16 port, | 698 | u8 ip_ver, __be16 port, |
| 699 | union cma_ip_addr *src, union cma_ip_addr *dst) | 699 | union cma_ip_addr *src, union cma_ip_addr *dst) |
| 700 | { | 700 | { |
| 701 | struct sockaddr_in *listen4, *ip4; | 701 | struct sockaddr_in *listen4, *ip4; |
| @@ -996,7 +996,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id, | |||
| 996 | struct rdma_cm_id *id; | 996 | struct rdma_cm_id *id; |
| 997 | struct rdma_route *rt; | 997 | struct rdma_route *rt; |
| 998 | union cma_ip_addr *src, *dst; | 998 | union cma_ip_addr *src, *dst; |
| 999 | __u16 port; | 999 | __be16 port; |
| 1000 | u8 ip_ver; | 1000 | u8 ip_ver; |
| 1001 | 1001 | ||
| 1002 | if (cma_get_net_info(ib_event->private_data, listen_id->ps, | 1002 | if (cma_get_net_info(ib_event->private_data, listen_id->ps, |
| @@ -1043,7 +1043,7 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id, | |||
| 1043 | struct rdma_id_private *id_priv; | 1043 | struct rdma_id_private *id_priv; |
| 1044 | struct rdma_cm_id *id; | 1044 | struct rdma_cm_id *id; |
| 1045 | union cma_ip_addr *src, *dst; | 1045 | union cma_ip_addr *src, *dst; |
| 1046 | __u16 port; | 1046 | __be16 port; |
| 1047 | u8 ip_ver; | 1047 | u8 ip_ver; |
| 1048 | int ret; | 1048 | int ret; |
| 1049 | 1049 | ||
| @@ -1165,7 +1165,7 @@ static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr, | |||
| 1165 | { | 1165 | { |
| 1166 | struct cma_hdr *cma_data, *cma_mask; | 1166 | struct cma_hdr *cma_data, *cma_mask; |
| 1167 | struct sdp_hh *sdp_data, *sdp_mask; | 1167 | struct sdp_hh *sdp_data, *sdp_mask; |
| 1168 | __u32 ip4_addr; | 1168 | __be32 ip4_addr; |
| 1169 | struct in6_addr ip6_addr; | 1169 | struct in6_addr ip6_addr; |
| 1170 | 1170 | ||
| 1171 | memset(compare, 0, sizeof *compare); | 1171 | memset(compare, 0, sizeof *compare); |
| @@ -1181,12 +1181,12 @@ static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr, | |||
| 1181 | sdp_set_ip_ver(sdp_data, 4); | 1181 | sdp_set_ip_ver(sdp_data, 4); |
| 1182 | sdp_set_ip_ver(sdp_mask, 0xF); | 1182 | sdp_set_ip_ver(sdp_mask, 0xF); |
| 1183 | sdp_data->dst_addr.ip4.addr = ip4_addr; | 1183 | sdp_data->dst_addr.ip4.addr = ip4_addr; |
| 1184 | sdp_mask->dst_addr.ip4.addr = ~0; | 1184 | sdp_mask->dst_addr.ip4.addr = htonl(~0); |
| 1185 | } else { | 1185 | } else { |
| 1186 | cma_set_ip_ver(cma_data, 4); | 1186 | cma_set_ip_ver(cma_data, 4); |
| 1187 | cma_set_ip_ver(cma_mask, 0xF); | 1187 | cma_set_ip_ver(cma_mask, 0xF); |
| 1188 | cma_data->dst_addr.ip4.addr = ip4_addr; | 1188 | cma_data->dst_addr.ip4.addr = ip4_addr; |
| 1189 | cma_mask->dst_addr.ip4.addr = ~0; | 1189 | cma_mask->dst_addr.ip4.addr = htonl(~0); |
| 1190 | } | 1190 | } |
| 1191 | break; | 1191 | break; |
| 1192 | case AF_INET6: | 1192 | case AF_INET6: |
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c index 320f2b6ddee6..99f2f2a46bf7 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c | |||
| @@ -1745,7 +1745,7 @@ int iwch_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) | |||
| 1745 | 1745 | ||
| 1746 | /* bind QP to EP and move to RTS */ | 1746 | /* bind QP to EP and move to RTS */ |
| 1747 | attrs.mpa_attr = ep->mpa_attr; | 1747 | attrs.mpa_attr = ep->mpa_attr; |
| 1748 | attrs.max_ird = ep->ord; | 1748 | attrs.max_ird = ep->ird; |
| 1749 | attrs.max_ord = ep->ord; | 1749 | attrs.max_ord = ep->ord; |
| 1750 | attrs.llp_stream_handle = ep; | 1750 | attrs.llp_stream_handle = ep; |
| 1751 | attrs.next_state = IWCH_QP_STATE_RTS; | 1751 | attrs.next_state = IWCH_QP_STATE_RTS; |
diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c index c36d110b349a..7d61a9660806 100644 --- a/drivers/input/apm-power.c +++ b/drivers/input/apm-power.c | |||
| @@ -63,8 +63,6 @@ static int apmpower_connect(struct input_handler *handler, | |||
| 63 | handle->handler = handler; | 63 | handle->handler = handler; |
| 64 | handle->name = "apm-power"; | 64 | handle->name = "apm-power"; |
| 65 | 65 | ||
| 66 | handler->private = handle; | ||
| 67 | |||
| 68 | error = input_register_handle(handle); | 66 | error = input_register_handle(handle); |
| 69 | if (error) { | 67 | if (error) { |
| 70 | printk(KERN_ERR | 68 | printk(KERN_ERR |
| @@ -87,11 +85,10 @@ static int apmpower_connect(struct input_handler *handler, | |||
| 87 | return 0; | 85 | return 0; |
| 88 | } | 86 | } |
| 89 | 87 | ||
| 90 | static void apmpower_disconnect(struct input_handle *handler) | 88 | static void apmpower_disconnect(struct input_handle *handle) |
| 91 | { | 89 | { |
| 92 | struct input_handle *handle = handler->private; | ||
| 93 | |||
| 94 | input_close_device(handle); | 90 | input_close_device(handle); |
| 91 | input_unregister_handle(handle); | ||
| 95 | kfree(handle); | 92 | kfree(handle); |
| 96 | } | 93 | } |
| 97 | 94 | ||
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 0727b0a12557..b32984bc516f 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -124,6 +124,7 @@ static void evdev_free(struct device *dev) | |||
| 124 | { | 124 | { |
| 125 | struct evdev *evdev = container_of(dev, struct evdev, dev); | 125 | struct evdev *evdev = container_of(dev, struct evdev, dev); |
| 126 | 126 | ||
| 127 | input_put_device(evdev->handle.dev); | ||
| 127 | kfree(evdev); | 128 | kfree(evdev); |
| 128 | } | 129 | } |
| 129 | 130 | ||
| @@ -893,7 +894,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev, | |||
| 893 | evdev->exist = 1; | 894 | evdev->exist = 1; |
| 894 | evdev->minor = minor; | 895 | evdev->minor = minor; |
| 895 | 896 | ||
| 896 | evdev->handle.dev = dev; | 897 | evdev->handle.dev = input_get_device(dev); |
| 897 | evdev->handle.name = evdev->name; | 898 | evdev->handle.name = evdev->name; |
| 898 | evdev->handle.handler = handler; | 899 | evdev->handle.handler = handler; |
| 899 | evdev->handle.private = evdev; | 900 | evdev->handle.private = evdev; |
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 22b2789ef58a..65d7077a75a1 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
| @@ -171,6 +171,7 @@ static void joydev_free(struct device *dev) | |||
| 171 | { | 171 | { |
| 172 | struct joydev *joydev = container_of(dev, struct joydev, dev); | 172 | struct joydev *joydev = container_of(dev, struct joydev, dev); |
| 173 | 173 | ||
| 174 | input_put_device(joydev->handle.dev); | ||
| 174 | kfree(joydev); | 175 | kfree(joydev); |
| 175 | } | 176 | } |
| 176 | 177 | ||
| @@ -750,7 +751,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev, | |||
| 750 | joydev->minor = minor; | 751 | joydev->minor = minor; |
| 751 | 752 | ||
| 752 | joydev->exist = 1; | 753 | joydev->exist = 1; |
| 753 | joydev->handle.dev = dev; | 754 | joydev->handle.dev = input_get_device(dev); |
| 754 | joydev->handle.name = joydev->name; | 755 | joydev->handle.name = joydev->name; |
| 755 | joydev->handle.handler = handler; | 756 | joydev->handle.handler = handler; |
| 756 | joydev->handle.private = joydev; | 757 | joydev->handle.private = joydev; |
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 6224c2fb3b65..4e651c11c1da 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
| @@ -50,9 +50,9 @@ | |||
| 50 | #define KPKDI 0x0048 | 50 | #define KPKDI 0x0048 |
| 51 | 51 | ||
| 52 | /* bit definitions */ | 52 | /* bit definitions */ |
| 53 | #define KPC_MKRN(n) ((((n) & 0x7) - 1) << 26) /* matrix key row number */ | 53 | #define KPC_MKRN(n) ((((n) - 1) & 0x7) << 26) /* matrix key row number */ |
| 54 | #define KPC_MKCN(n) ((((n) & 0x7) - 1) << 23) /* matrix key column number */ | 54 | #define KPC_MKCN(n) ((((n) - 1) & 0x7) << 23) /* matrix key column number */ |
| 55 | #define KPC_DKN(n) ((((n) & 0x7) - 1) << 6) /* direct key number */ | 55 | #define KPC_DKN(n) ((((n) - 1) & 0x7) << 6) /* direct key number */ |
| 56 | 56 | ||
| 57 | #define KPC_AS (0x1 << 30) /* Automatic Scan bit */ | 57 | #define KPC_AS (0x1 << 30) /* Automatic Scan bit */ |
| 58 | #define KPC_ASACT (0x1 << 29) /* Automatic Scan on Activity */ | 58 | #define KPC_ASACT (0x1 << 29) /* Automatic Scan on Activity */ |
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index d2ade7443b7d..798d84c44d03 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); | 25 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); |
| 26 | MODULE_DESCRIPTION("ixp4xx beeper driver"); | 26 | MODULE_DESCRIPTION("ixp4xx beeper driver"); |
| 27 | MODULE_LICENSE("GPL"); | 27 | MODULE_LICENSE("GPL"); |
| 28 | MODULE_ALIAS("platform:ixp4xx-beeper"); | ||
| 28 | 29 | ||
| 29 | static DEFINE_SPINLOCK(beep_lock); | 30 | static DEFINE_SPINLOCK(beep_lock); |
| 30 | 31 | ||
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index bbbe5e81adc1..b989748598ae 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -414,6 +414,7 @@ static void mousedev_free(struct device *dev) | |||
| 414 | { | 414 | { |
| 415 | struct mousedev *mousedev = container_of(dev, struct mousedev, dev); | 415 | struct mousedev *mousedev = container_of(dev, struct mousedev, dev); |
| 416 | 416 | ||
| 417 | input_put_device(mousedev->handle.dev); | ||
| 417 | kfree(mousedev); | 418 | kfree(mousedev); |
| 418 | } | 419 | } |
| 419 | 420 | ||
| @@ -865,7 +866,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, | |||
| 865 | 866 | ||
| 866 | mousedev->minor = minor; | 867 | mousedev->minor = minor; |
| 867 | mousedev->exist = 1; | 868 | mousedev->exist = 1; |
| 868 | mousedev->handle.dev = dev; | 869 | mousedev->handle.dev = input_get_device(dev); |
| 869 | mousedev->handle.name = mousedev->name; | 870 | mousedev->handle.name = mousedev->name; |
| 870 | mousedev->handle.handler = handler; | 871 | mousedev->handle.handler = handler; |
| 871 | mousedev->handle.private = mousedev; | 872 | mousedev->handle.private = mousedev; |
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 6c0a9c4761ee..4c0b05852cb6 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c | |||
| @@ -49,13 +49,13 @@ static void gpio_led_set(struct led_classdev *led_cdev, | |||
| 49 | if (led_dat->active_low) | 49 | if (led_dat->active_low) |
| 50 | level = !level; | 50 | level = !level; |
| 51 | 51 | ||
| 52 | /* setting GPIOs with I2C/etc requires a preemptible task context */ | 52 | /* Setting GPIOs with I2C/etc requires a task context, and we don't |
| 53 | * seem to have a reliable way to know if we're already in one; so | ||
| 54 | * let's just assume the worst. | ||
| 55 | */ | ||
| 53 | if (led_dat->can_sleep) { | 56 | if (led_dat->can_sleep) { |
| 54 | if (preempt_count()) { | 57 | led_dat->new_level = level; |
| 55 | led_dat->new_level = level; | 58 | schedule_work(&led_dat->work); |
| 56 | schedule_work(&led_dat->work); | ||
| 57 | } else | ||
| 58 | gpio_set_value_cansleep(led_dat->gpio, level); | ||
| 59 | } else | 59 | } else |
| 60 | gpio_set_value(led_dat->gpio, level); | 60 | gpio_set_value(led_dat->gpio, level); |
| 61 | } | 61 | } |
| @@ -79,6 +79,10 @@ static int gpio_led_probe(struct platform_device *pdev) | |||
| 79 | cur_led = &pdata->leds[i]; | 79 | cur_led = &pdata->leds[i]; |
| 80 | led_dat = &leds_data[i]; | 80 | led_dat = &leds_data[i]; |
| 81 | 81 | ||
| 82 | ret = gpio_request(cur_led->gpio, cur_led->name); | ||
| 83 | if (ret < 0) | ||
| 84 | goto err; | ||
| 85 | |||
| 82 | led_dat->cdev.name = cur_led->name; | 86 | led_dat->cdev.name = cur_led->name; |
| 83 | led_dat->cdev.default_trigger = cur_led->default_trigger; | 87 | led_dat->cdev.default_trigger = cur_led->default_trigger; |
| 84 | led_dat->gpio = cur_led->gpio; | 88 | led_dat->gpio = cur_led->gpio; |
| @@ -87,10 +91,6 @@ static int gpio_led_probe(struct platform_device *pdev) | |||
| 87 | led_dat->cdev.brightness_set = gpio_led_set; | 91 | led_dat->cdev.brightness_set = gpio_led_set; |
| 88 | led_dat->cdev.brightness = LED_OFF; | 92 | led_dat->cdev.brightness = LED_OFF; |
| 89 | 93 | ||
| 90 | ret = gpio_request(led_dat->gpio, led_dat->cdev.name); | ||
| 91 | if (ret < 0) | ||
| 92 | goto err; | ||
| 93 | |||
| 94 | gpio_direction_output(led_dat->gpio, led_dat->active_low); | 94 | gpio_direction_output(led_dat->gpio, led_dat->active_low); |
| 95 | 95 | ||
| 96 | INIT_WORK(&led_dat->work, gpio_led_work); | 96 | INIT_WORK(&led_dat->work, gpio_led_work); |
diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile index 5e8272d296d8..7d463c26124f 100644 --- a/drivers/lguest/Makefile +++ b/drivers/lguest/Makefile | |||
| @@ -19,3 +19,11 @@ Beer: | |||
| 19 | @for f in Preparation Guest Drivers Launcher Host Switcher Mastery; do echo "{==- $$f -==}"; make -s $$f; done; echo "{==-==}" | 19 | @for f in Preparation Guest Drivers Launcher Host Switcher Mastery; do echo "{==- $$f -==}"; make -s $$f; done; echo "{==-==}" |
| 20 | Preparation Preparation! Guest Drivers Launcher Host Switcher Mastery: | 20 | Preparation Preparation! Guest Drivers Launcher Host Switcher Mastery: |
| 21 | @sh ../../Documentation/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'` | 21 | @sh ../../Documentation/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'` |
| 22 | Puppy: | ||
| 23 | @clear | ||
| 24 | @printf " __ \n (___()'\`;\n /, /\`\n \\\\\\\"--\\\\\\ \n" | ||
| 25 | @sleep 2; clear; printf "\n\n Sit!\n\n"; sleep 1; clear | ||
| 26 | @printf " __ \n ()'\`; \n /\\|\` \n / | \n(/_)_|_ \n" | ||
| 27 | @sleep 2; clear; printf "\n\n Stand!\n\n"; sleep 1; clear | ||
| 28 | @printf " __ \n ()'\`; \n /\\|\` \n /._.= \n /| / \n(_\_)_ \n" | ||
| 29 | @sleep 2; clear; printf "\n\n Good puppy!\n\n"; sleep 1; clear | ||
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c index c632c08cbbdc..5eea4356d703 100644 --- a/drivers/lguest/core.c +++ b/drivers/lguest/core.c | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | /*P:400 This contains run_guest() which actually calls into the Host<->Guest | 1 | /*P:400 This contains run_guest() which actually calls into the Host<->Guest |
| 2 | * Switcher and analyzes the return, such as determining if the Guest wants the | 2 | * Switcher and analyzes the return, such as determining if the Guest wants the |
| 3 | * Host to do something. This file also contains useful helper routines, and a | 3 | * Host to do something. This file also contains useful helper routines. :*/ |
| 4 | * couple of non-obvious setup and teardown pieces which were implemented after | ||
| 5 | * days of debugging pain. :*/ | ||
| 6 | #include <linux/module.h> | 4 | #include <linux/module.h> |
| 7 | #include <linux/stringify.h> | 5 | #include <linux/stringify.h> |
| 8 | #include <linux/stddef.h> | 6 | #include <linux/stddef.h> |
| @@ -49,8 +47,8 @@ static __init int map_switcher(void) | |||
| 49 | * easy. | 47 | * easy. |
| 50 | */ | 48 | */ |
| 51 | 49 | ||
| 52 | /* We allocate an array of "struct page"s. map_vm_area() wants the | 50 | /* We allocate an array of struct page pointers. map_vm_area() wants |
| 53 | * pages in this form, rather than just an array of pointers. */ | 51 | * this, rather than just an array of pages. */ |
| 54 | switcher_page = kmalloc(sizeof(switcher_page[0])*TOTAL_SWITCHER_PAGES, | 52 | switcher_page = kmalloc(sizeof(switcher_page[0])*TOTAL_SWITCHER_PAGES, |
| 55 | GFP_KERNEL); | 53 | GFP_KERNEL); |
| 56 | if (!switcher_page) { | 54 | if (!switcher_page) { |
| @@ -172,7 +170,7 @@ void __lgread(struct lg_cpu *cpu, void *b, unsigned long addr, unsigned bytes) | |||
| 172 | } | 170 | } |
| 173 | } | 171 | } |
| 174 | 172 | ||
| 175 | /* This is the write (copy into guest) version. */ | 173 | /* This is the write (copy into Guest) version. */ |
| 176 | void __lgwrite(struct lg_cpu *cpu, unsigned long addr, const void *b, | 174 | void __lgwrite(struct lg_cpu *cpu, unsigned long addr, const void *b, |
| 177 | unsigned bytes) | 175 | unsigned bytes) |
| 178 | { | 176 | { |
| @@ -209,9 +207,9 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user) | |||
| 209 | if (cpu->break_out) | 207 | if (cpu->break_out) |
| 210 | return -EAGAIN; | 208 | return -EAGAIN; |
| 211 | 209 | ||
| 212 | /* Check if there are any interrupts which can be delivered | 210 | /* Check if there are any interrupts which can be delivered now: |
| 213 | * now: if so, this sets up the hander to be executed when we | 211 | * if so, this sets up the hander to be executed when we next |
| 214 | * next run the Guest. */ | 212 | * run the Guest. */ |
| 215 | maybe_do_interrupt(cpu); | 213 | maybe_do_interrupt(cpu); |
| 216 | 214 | ||
| 217 | /* All long-lived kernel loops need to check with this horrible | 215 | /* All long-lived kernel loops need to check with this horrible |
| @@ -246,8 +244,10 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user) | |||
| 246 | lguest_arch_handle_trap(cpu); | 244 | lguest_arch_handle_trap(cpu); |
| 247 | } | 245 | } |
| 248 | 246 | ||
| 247 | /* Special case: Guest is 'dead' but wants a reboot. */ | ||
| 249 | if (cpu->lg->dead == ERR_PTR(-ERESTART)) | 248 | if (cpu->lg->dead == ERR_PTR(-ERESTART)) |
| 250 | return -ERESTART; | 249 | return -ERESTART; |
| 250 | |||
| 251 | /* The Guest is dead => "No such file or directory" */ | 251 | /* The Guest is dead => "No such file or directory" */ |
| 252 | return -ENOENT; | 252 | return -ENOENT; |
| 253 | } | 253 | } |
diff --git a/drivers/lguest/hypercalls.c b/drivers/lguest/hypercalls.c index 0f2cb4fd7c69..54d66f05fefa 100644 --- a/drivers/lguest/hypercalls.c +++ b/drivers/lguest/hypercalls.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include "lg.h" | 29 | #include "lg.h" |
| 30 | 30 | ||
| 31 | /*H:120 This is the core hypercall routine: where the Guest gets what it wants. | 31 | /*H:120 This is the core hypercall routine: where the Guest gets what it wants. |
| 32 | * Or gets killed. Or, in the case of LHCALL_CRASH, both. */ | 32 | * Or gets killed. Or, in the case of LHCALL_SHUTDOWN, both. */ |
| 33 | static void do_hcall(struct lg_cpu *cpu, struct hcall_args *args) | 33 | static void do_hcall(struct lg_cpu *cpu, struct hcall_args *args) |
| 34 | { | 34 | { |
| 35 | switch (args->arg0) { | 35 | switch (args->arg0) { |
| @@ -190,6 +190,13 @@ static void initialize(struct lg_cpu *cpu) | |||
| 190 | * pagetable. */ | 190 | * pagetable. */ |
| 191 | guest_pagetable_clear_all(cpu); | 191 | guest_pagetable_clear_all(cpu); |
| 192 | } | 192 | } |
| 193 | /*:*/ | ||
| 194 | |||
| 195 | /*M:013 If a Guest reads from a page (so creates a mapping) that it has never | ||
| 196 | * written to, and then the Launcher writes to it (ie. the output of a virtual | ||
| 197 | * device), the Guest will still see the old page. In practice, this never | ||
| 198 | * happens: why would the Guest read a page which it has never written to? But | ||
| 199 | * a similar scenario might one day bite us, so it's worth mentioning. :*/ | ||
| 193 | 200 | ||
| 194 | /*H:100 | 201 | /*H:100 |
| 195 | * Hypercalls | 202 | * Hypercalls |
| @@ -227,7 +234,7 @@ void do_hypercalls(struct lg_cpu *cpu) | |||
| 227 | * However, if we are signalled or the Guest sends I/O to the | 234 | * However, if we are signalled or the Guest sends I/O to the |
| 228 | * Launcher, the run_guest() loop will exit without running the | 235 | * Launcher, the run_guest() loop will exit without running the |
| 229 | * Guest. When it comes back it would try to re-run the | 236 | * Guest. When it comes back it would try to re-run the |
| 230 | * hypercall. */ | 237 | * hypercall. Finding that bug sucked. */ |
| 231 | cpu->hcall = NULL; | 238 | cpu->hcall = NULL; |
| 232 | } | 239 | } |
| 233 | } | 240 | } |
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c index 32e97c1858e5..0414ddf87587 100644 --- a/drivers/lguest/interrupts_and_traps.c +++ b/drivers/lguest/interrupts_and_traps.c | |||
| @@ -144,7 +144,6 @@ void maybe_do_interrupt(struct lg_cpu *cpu) | |||
| 144 | if (copy_from_user(&blk, cpu->lg->lguest_data->blocked_interrupts, | 144 | if (copy_from_user(&blk, cpu->lg->lguest_data->blocked_interrupts, |
| 145 | sizeof(blk))) | 145 | sizeof(blk))) |
| 146 | return; | 146 | return; |
| 147 | |||
| 148 | bitmap_andnot(blk, cpu->irqs_pending, blk, LGUEST_IRQS); | 147 | bitmap_andnot(blk, cpu->irqs_pending, blk, LGUEST_IRQS); |
| 149 | 148 | ||
| 150 | /* Find the first interrupt. */ | 149 | /* Find the first interrupt. */ |
| @@ -237,9 +236,9 @@ void free_interrupts(void) | |||
| 237 | clear_bit(syscall_vector, used_vectors); | 236 | clear_bit(syscall_vector, used_vectors); |
| 238 | } | 237 | } |
| 239 | 238 | ||
| 240 | /*H:220 Now we've got the routines to deliver interrupts, delivering traps | 239 | /*H:220 Now we've got the routines to deliver interrupts, delivering traps like |
| 241 | * like page fault is easy. The only trick is that Intel decided that some | 240 | * page fault is easy. The only trick is that Intel decided that some traps |
| 242 | * traps should have error codes: */ | 241 | * should have error codes: */ |
| 243 | static int has_err(unsigned int trap) | 242 | static int has_err(unsigned int trap) |
| 244 | { | 243 | { |
| 245 | return (trap == 8 || (trap >= 10 && trap <= 14) || trap == 17); | 244 | return (trap == 8 || (trap >= 10 && trap <= 14) || trap == 17); |
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c index 1b2ec0bf5eb1..2bc9bf7e88e5 100644 --- a/drivers/lguest/lguest_device.c +++ b/drivers/lguest/lguest_device.c | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | /*P:050 Lguest guests use a very simple method to describe devices. It's a | 1 | /*P:050 Lguest guests use a very simple method to describe devices. It's a |
| 2 | * series of device descriptors contained just above the top of normal | 2 | * series of device descriptors contained just above the top of normal Guest |
| 3 | * memory. | 3 | * memory. |
| 4 | * | 4 | * |
| 5 | * We use the standard "virtio" device infrastructure, which provides us with a | 5 | * We use the standard "virtio" device infrastructure, which provides us with a |
| 6 | * console, a network and a block driver. Each one expects some configuration | 6 | * console, a network and a block driver. Each one expects some configuration |
| 7 | * information and a "virtqueue" mechanism to send and receive data. :*/ | 7 | * information and a "virtqueue" or two to send and receive data. :*/ |
| 8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 9 | #include <linux/bootmem.h> | 9 | #include <linux/bootmem.h> |
| 10 | #include <linux/lguest_launcher.h> | 10 | #include <linux/lguest_launcher.h> |
| @@ -53,7 +53,7 @@ struct lguest_device { | |||
| 53 | * Device configurations | 53 | * Device configurations |
| 54 | * | 54 | * |
| 55 | * The configuration information for a device consists of one or more | 55 | * The configuration information for a device consists of one or more |
| 56 | * virtqueues, a feature bitmaks, and some configuration bytes. The | 56 | * virtqueues, a feature bitmap, and some configuration bytes. The |
| 57 | * configuration bytes don't really matter to us: the Launcher sets them up, and | 57 | * configuration bytes don't really matter to us: the Launcher sets them up, and |
| 58 | * the driver will look at them during setup. | 58 | * the driver will look at them during setup. |
| 59 | * | 59 | * |
| @@ -179,7 +179,7 @@ struct lguest_vq_info | |||
| 179 | }; | 179 | }; |
| 180 | 180 | ||
| 181 | /* When the virtio_ring code wants to prod the Host, it calls us here and we | 181 | /* When the virtio_ring code wants to prod the Host, it calls us here and we |
| 182 | * make a hypercall. We hand the page number of the virtqueue so the Host | 182 | * make a hypercall. We hand the physical address of the virtqueue so the Host |
| 183 | * knows which virtqueue we're talking about. */ | 183 | * knows which virtqueue we're talking about. */ |
| 184 | static void lg_notify(struct virtqueue *vq) | 184 | static void lg_notify(struct virtqueue *vq) |
| 185 | { | 185 | { |
| @@ -199,7 +199,8 @@ static void lg_notify(struct virtqueue *vq) | |||
| 199 | * allocate its own pages and tell the Host where they are, but for lguest it's | 199 | * allocate its own pages and tell the Host where they are, but for lguest it's |
| 200 | * simpler for the Host to simply tell us where the pages are. | 200 | * simpler for the Host to simply tell us where the pages are. |
| 201 | * | 201 | * |
| 202 | * So we provide devices with a "find virtqueue and set it up" function. */ | 202 | * So we provide drivers with a "find the Nth virtqueue and set it up" |
| 203 | * function. */ | ||
| 203 | static struct virtqueue *lg_find_vq(struct virtio_device *vdev, | 204 | static struct virtqueue *lg_find_vq(struct virtio_device *vdev, |
| 204 | unsigned index, | 205 | unsigned index, |
| 205 | void (*callback)(struct virtqueue *vq)) | 206 | void (*callback)(struct virtqueue *vq)) |
diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c index 2221485b0773..645e6e040bfb 100644 --- a/drivers/lguest/lguest_user.c +++ b/drivers/lguest/lguest_user.c | |||
| @@ -73,7 +73,7 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o) | |||
| 73 | if (current != cpu->tsk) | 73 | if (current != cpu->tsk) |
| 74 | return -EPERM; | 74 | return -EPERM; |
| 75 | 75 | ||
| 76 | /* If the guest is already dead, we indicate why */ | 76 | /* If the Guest is already dead, we indicate why */ |
| 77 | if (lg->dead) { | 77 | if (lg->dead) { |
| 78 | size_t len; | 78 | size_t len; |
| 79 | 79 | ||
| @@ -88,7 +88,7 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o) | |||
| 88 | return len; | 88 | return len; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | /* If we returned from read() last time because the Guest notified, | 91 | /* If we returned from read() last time because the Guest sent I/O, |
| 92 | * clear the flag. */ | 92 | * clear the flag. */ |
| 93 | if (cpu->pending_notify) | 93 | if (cpu->pending_notify) |
| 94 | cpu->pending_notify = 0; | 94 | cpu->pending_notify = 0; |
| @@ -97,14 +97,20 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o) | |||
| 97 | return run_guest(cpu, (unsigned long __user *)user); | 97 | return run_guest(cpu, (unsigned long __user *)user); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | /*L:025 This actually initializes a CPU. For the moment, a Guest is only | ||
| 101 | * uniprocessor, so "id" is always 0. */ | ||
| 100 | static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip) | 102 | static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip) |
| 101 | { | 103 | { |
| 104 | /* We have a limited number the number of CPUs in the lguest struct. */ | ||
| 102 | if (id >= NR_CPUS) | 105 | if (id >= NR_CPUS) |
| 103 | return -EINVAL; | 106 | return -EINVAL; |
| 104 | 107 | ||
| 108 | /* Set up this CPU's id, and pointer back to the lguest struct. */ | ||
| 105 | cpu->id = id; | 109 | cpu->id = id; |
| 106 | cpu->lg = container_of((cpu - id), struct lguest, cpus[0]); | 110 | cpu->lg = container_of((cpu - id), struct lguest, cpus[0]); |
| 107 | cpu->lg->nr_cpus++; | 111 | cpu->lg->nr_cpus++; |
| 112 | |||
| 113 | /* Each CPU has a timer it can set. */ | ||
| 108 | init_clockdev(cpu); | 114 | init_clockdev(cpu); |
| 109 | 115 | ||
| 110 | /* We need a complete page for the Guest registers: they are accessible | 116 | /* We need a complete page for the Guest registers: they are accessible |
| @@ -120,11 +126,11 @@ static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip) | |||
| 120 | * address. */ | 126 | * address. */ |
| 121 | lguest_arch_setup_regs(cpu, start_ip); | 127 | lguest_arch_setup_regs(cpu, start_ip); |
| 122 | 128 | ||
| 123 | /* Initialize the queue for the waker to wait on */ | 129 | /* Initialize the queue for the Waker to wait on */ |
| 124 | init_waitqueue_head(&cpu->break_wq); | 130 | init_waitqueue_head(&cpu->break_wq); |
| 125 | 131 | ||
| 126 | /* We keep a pointer to the Launcher task (ie. current task) for when | 132 | /* We keep a pointer to the Launcher task (ie. current task) for when |
| 127 | * other Guests want to wake this one (inter-Guest I/O). */ | 133 | * other Guests want to wake this one (eg. console input). */ |
| 128 | cpu->tsk = current; | 134 | cpu->tsk = current; |
| 129 | 135 | ||
| 130 | /* We need to keep a pointer to the Launcher's memory map, because if | 136 | /* We need to keep a pointer to the Launcher's memory map, because if |
| @@ -136,6 +142,7 @@ static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip) | |||
| 136 | * when the same Guest runs on the same CPU twice. */ | 142 | * when the same Guest runs on the same CPU twice. */ |
| 137 | cpu->last_pages = NULL; | 143 | cpu->last_pages = NULL; |
| 138 | 144 | ||
| 145 | /* No error == success. */ | ||
| 139 | return 0; | 146 | return 0; |
| 140 | } | 147 | } |
| 141 | 148 | ||
| @@ -182,17 +189,16 @@ static int initialize(struct file *file, const unsigned long __user *input) | |||
| 182 | } | 189 | } |
| 183 | 190 | ||
| 184 | /* Populate the easy fields of our "struct lguest" */ | 191 | /* Populate the easy fields of our "struct lguest" */ |
| 185 | lg->mem_base = (void __user *)(long)args[0]; | 192 | lg->mem_base = (void __user *)args[0]; |
| 186 | lg->pfn_limit = args[1]; | 193 | lg->pfn_limit = args[1]; |
| 187 | 194 | ||
| 188 | /* This is the first cpu */ | 195 | /* This is the first cpu (cpu 0) and it will start booting at args[3] */ |
| 189 | err = lg_cpu_start(&lg->cpus[0], 0, args[3]); | 196 | err = lg_cpu_start(&lg->cpus[0], 0, args[3]); |
| 190 | if (err) | 197 | if (err) |
| 191 | goto release_guest; | 198 | goto release_guest; |
| 192 | 199 | ||
| 193 | /* Initialize the Guest's shadow page tables, using the toplevel | 200 | /* Initialize the Guest's shadow page tables, using the toplevel |
| 194 | * address the Launcher gave us. This allocates memory, so can | 201 | * address the Launcher gave us. This allocates memory, so can fail. */ |
| 195 | * fail. */ | ||
| 196 | err = init_guest_pagetable(lg, args[2]); | 202 | err = init_guest_pagetable(lg, args[2]); |
| 197 | if (err) | 203 | if (err) |
| 198 | goto free_regs; | 204 | goto free_regs; |
| @@ -218,11 +224,16 @@ unlock: | |||
| 218 | /*L:010 The first operation the Launcher does must be a write. All writes | 224 | /*L:010 The first operation the Launcher does must be a write. All writes |
| 219 | * start with an unsigned long number: for the first write this must be | 225 | * start with an unsigned long number: for the first write this must be |
| 220 | * LHREQ_INITIALIZE to set up the Guest. After that the Launcher can use | 226 | * LHREQ_INITIALIZE to set up the Guest. After that the Launcher can use |
| 221 | * writes of other values to send interrupts. */ | 227 | * writes of other values to send interrupts. |
| 228 | * | ||
| 229 | * Note that we overload the "offset" in the /dev/lguest file to indicate what | ||
| 230 | * CPU number we're dealing with. Currently this is always 0, since we only | ||
| 231 | * support uniprocessor Guests, but you can see the beginnings of SMP support | ||
| 232 | * here. */ | ||
| 222 | static ssize_t write(struct file *file, const char __user *in, | 233 | static ssize_t write(struct file *file, const char __user *in, |
| 223 | size_t size, loff_t *off) | 234 | size_t size, loff_t *off) |
| 224 | { | 235 | { |
| 225 | /* Once the guest is initialized, we hold the "struct lguest" in the | 236 | /* Once the Guest is initialized, we hold the "struct lguest" in the |
| 226 | * file private data. */ | 237 | * file private data. */ |
| 227 | struct lguest *lg = file->private_data; | 238 | struct lguest *lg = file->private_data; |
| 228 | const unsigned long __user *input = (const unsigned long __user *)in; | 239 | const unsigned long __user *input = (const unsigned long __user *)in; |
| @@ -230,6 +241,7 @@ static ssize_t write(struct file *file, const char __user *in, | |||
| 230 | struct lg_cpu *uninitialized_var(cpu); | 241 | struct lg_cpu *uninitialized_var(cpu); |
| 231 | unsigned int cpu_id = *off; | 242 | unsigned int cpu_id = *off; |
| 232 | 243 | ||
| 244 | /* The first value tells us what this request is. */ | ||
| 233 | if (get_user(req, input) != 0) | 245 | if (get_user(req, input) != 0) |
| 234 | return -EFAULT; | 246 | return -EFAULT; |
| 235 | input++; | 247 | input++; |
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index a7f64a9d67e0..d93500f24fbb 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | * previous encounters. It's functional, and as neat as it can be in the | 2 | * previous encounters. It's functional, and as neat as it can be in the |
| 3 | * circumstances, but be wary, for these things are subtle and break easily. | 3 | * circumstances, but be wary, for these things are subtle and break easily. |
| 4 | * The Guest provides a virtual to physical mapping, but we can neither trust | 4 | * The Guest provides a virtual to physical mapping, but we can neither trust |
| 5 | * it nor use it: we verify and convert it here to point the hardware to the | 5 | * it nor use it: we verify and convert it here then point the CPU to the |
| 6 | * actual Guest pages when running the Guest. :*/ | 6 | * converted Guest pages when running the Guest. :*/ |
| 7 | 7 | ||
| 8 | /* Copyright (C) Rusty Russell IBM Corporation 2006. | 8 | /* Copyright (C) Rusty Russell IBM Corporation 2006. |
| 9 | * GPL v2 and any later version */ | 9 | * GPL v2 and any later version */ |
| @@ -106,6 +106,11 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr) | |||
| 106 | BUG_ON(!(pgd_flags(gpgd) & _PAGE_PRESENT)); | 106 | BUG_ON(!(pgd_flags(gpgd) & _PAGE_PRESENT)); |
| 107 | return gpage + ((vaddr>>PAGE_SHIFT) % PTRS_PER_PTE) * sizeof(pte_t); | 107 | return gpage + ((vaddr>>PAGE_SHIFT) % PTRS_PER_PTE) * sizeof(pte_t); |
| 108 | } | 108 | } |
| 109 | /*:*/ | ||
| 110 | |||
| 111 | /*M:014 get_pfn is slow; it takes the mmap sem and calls get_user_pages. We | ||
| 112 | * could probably try to grab batches of pages here as an optimization | ||
| 113 | * (ie. pre-faulting). :*/ | ||
| 109 | 114 | ||
| 110 | /*H:350 This routine takes a page number given by the Guest and converts it to | 115 | /*H:350 This routine takes a page number given by the Guest and converts it to |
| 111 | * an actual, physical page number. It can fail for several reasons: the | 116 | * an actual, physical page number. It can fail for several reasons: the |
| @@ -113,8 +118,8 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr) | |||
| 113 | * and the page is read-only, or the write flag was set and the page was | 118 | * and the page is read-only, or the write flag was set and the page was |
| 114 | * shared so had to be copied, but we ran out of memory. | 119 | * shared so had to be copied, but we ran out of memory. |
| 115 | * | 120 | * |
| 116 | * This holds a reference to the page, so release_pte() is careful to | 121 | * This holds a reference to the page, so release_pte() is careful to put that |
| 117 | * put that back. */ | 122 | * back. */ |
| 118 | static unsigned long get_pfn(unsigned long virtpfn, int write) | 123 | static unsigned long get_pfn(unsigned long virtpfn, int write) |
| 119 | { | 124 | { |
| 120 | struct page *page; | 125 | struct page *page; |
| @@ -532,13 +537,13 @@ static void do_set_pte(struct lg_cpu *cpu, int idx, | |||
| 532 | * all processes. So when the page table above that address changes, we update | 537 | * all processes. So when the page table above that address changes, we update |
| 533 | * all the page tables, not just the current one. This is rare. | 538 | * all the page tables, not just the current one. This is rare. |
| 534 | * | 539 | * |
| 535 | * The benefit is that when we have to track a new page table, we can copy keep | 540 | * The benefit is that when we have to track a new page table, we can keep all |
| 536 | * all the kernel mappings. This speeds up context switch immensely. */ | 541 | * the kernel mappings. This speeds up context switch immensely. */ |
| 537 | void guest_set_pte(struct lg_cpu *cpu, | 542 | void guest_set_pte(struct lg_cpu *cpu, |
| 538 | unsigned long gpgdir, unsigned long vaddr, pte_t gpte) | 543 | unsigned long gpgdir, unsigned long vaddr, pte_t gpte) |
| 539 | { | 544 | { |
| 540 | /* Kernel mappings must be changed on all top levels. Slow, but | 545 | /* Kernel mappings must be changed on all top levels. Slow, but doesn't |
| 541 | * doesn't happen often. */ | 546 | * happen often. */ |
| 542 | if (vaddr >= cpu->lg->kernel_address) { | 547 | if (vaddr >= cpu->lg->kernel_address) { |
| 543 | unsigned int i; | 548 | unsigned int i; |
| 544 | for (i = 0; i < ARRAY_SIZE(cpu->lg->pgdirs); i++) | 549 | for (i = 0; i < ARRAY_SIZE(cpu->lg->pgdirs); i++) |
| @@ -704,12 +709,11 @@ static __init void populate_switcher_pte_page(unsigned int cpu, | |||
| 704 | /* We've made it through the page table code. Perhaps our tired brains are | 709 | /* We've made it through the page table code. Perhaps our tired brains are |
| 705 | * still processing the details, or perhaps we're simply glad it's over. | 710 | * still processing the details, or perhaps we're simply glad it's over. |
| 706 | * | 711 | * |
| 707 | * If nothing else, note that all this complexity in juggling shadow page | 712 | * If nothing else, note that all this complexity in juggling shadow page tables |
| 708 | * tables in sync with the Guest's page tables is for one reason: for most | 713 | * in sync with the Guest's page tables is for one reason: for most Guests this |
| 709 | * Guests this page table dance determines how bad performance will be. This | 714 | * page table dance determines how bad performance will be. This is why Xen |
| 710 | * is why Xen uses exotic direct Guest pagetable manipulation, and why both | 715 | * uses exotic direct Guest pagetable manipulation, and why both Intel and AMD |
| 711 | * Intel and AMD have implemented shadow page table support directly into | 716 | * have implemented shadow page table support directly into hardware. |
| 712 | * hardware. | ||
| 713 | * | 717 | * |
| 714 | * There is just one file remaining in the Host. */ | 718 | * There is just one file remaining in the Host. */ |
| 715 | 719 | ||
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index 635187812d52..5126d5d9ea0e 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c | |||
| @@ -17,6 +17,13 @@ | |||
| 17 | * along with this program; if not, write to the Free Software | 17 | * along with this program; if not, write to the Free Software |
| 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 19 | */ | 19 | */ |
| 20 | /*P:450 This file contains the x86-specific lguest code. It used to be all | ||
| 21 | * mixed in with drivers/lguest/core.c but several foolhardy code slashers | ||
| 22 | * wrestled most of the dependencies out to here in preparation for porting | ||
| 23 | * lguest to other architectures (see what I mean by foolhardy?). | ||
| 24 | * | ||
| 25 | * This also contains a couple of non-obvious setup and teardown pieces which | ||
| 26 | * were implemented after days of debugging pain. :*/ | ||
| 20 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 21 | #include <linux/start_kernel.h> | 28 | #include <linux/start_kernel.h> |
| 22 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| @@ -157,6 +164,8 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages) | |||
| 157 | * also simplify copy_in_guest_info(). Note that we'd still need to restore | 164 | * also simplify copy_in_guest_info(). Note that we'd still need to restore |
| 158 | * things when we exit to Launcher userspace, but that's fairly easy. | 165 | * things when we exit to Launcher userspace, but that's fairly easy. |
| 159 | * | 166 | * |
| 167 | * We could also try using this hooks for PGE, but that might be too expensive. | ||
| 168 | * | ||
| 160 | * The hooks were designed for KVM, but we can also put them to good use. :*/ | 169 | * The hooks were designed for KVM, but we can also put them to good use. :*/ |
| 161 | 170 | ||
| 162 | /*H:040 This is the i386-specific code to setup and run the Guest. Interrupts | 171 | /*H:040 This is the i386-specific code to setup and run the Guest. Interrupts |
| @@ -182,7 +191,7 @@ void lguest_arch_run_guest(struct lg_cpu *cpu) | |||
| 182 | * was doing. */ | 191 | * was doing. */ |
| 183 | run_guest_once(cpu, lguest_pages(raw_smp_processor_id())); | 192 | run_guest_once(cpu, lguest_pages(raw_smp_processor_id())); |
| 184 | 193 | ||
| 185 | /* Note that the "regs" pointer contains two extra entries which are | 194 | /* Note that the "regs" structure contains two extra entries which are |
| 186 | * not really registers: a trap number which says what interrupt or | 195 | * not really registers: a trap number which says what interrupt or |
| 187 | * trap made the switcher code come back, and an error code which some | 196 | * trap made the switcher code come back, and an error code which some |
| 188 | * traps set. */ | 197 | * traps set. */ |
| @@ -293,11 +302,10 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu) | |||
| 293 | break; | 302 | break; |
| 294 | case 14: /* We've intercepted a Page Fault. */ | 303 | case 14: /* We've intercepted a Page Fault. */ |
| 295 | /* The Guest accessed a virtual address that wasn't mapped. | 304 | /* The Guest accessed a virtual address that wasn't mapped. |
| 296 | * This happens a lot: we don't actually set up most of the | 305 | * This happens a lot: we don't actually set up most of the page |
| 297 | * page tables for the Guest at all when we start: as it runs | 306 | * tables for the Guest at all when we start: as it runs it asks |
| 298 | * it asks for more and more, and we set them up as | 307 | * for more and more, and we set them up as required. In this |
| 299 | * required. In this case, we don't even tell the Guest that | 308 | * case, we don't even tell the Guest that the fault happened. |
| 300 | * the fault happened. | ||
| 301 | * | 309 | * |
| 302 | * The errcode tells whether this was a read or a write, and | 310 | * The errcode tells whether this was a read or a write, and |
| 303 | * whether kernel or userspace code. */ | 311 | * whether kernel or userspace code. */ |
| @@ -342,7 +350,7 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu) | |||
| 342 | if (!deliver_trap(cpu, cpu->regs->trapnum)) | 350 | if (!deliver_trap(cpu, cpu->regs->trapnum)) |
| 343 | /* If the Guest doesn't have a handler (either it hasn't | 351 | /* If the Guest doesn't have a handler (either it hasn't |
| 344 | * registered any yet, or it's one of the faults we don't let | 352 | * registered any yet, or it's one of the faults we don't let |
| 345 | * it handle), it dies with a cryptic error message. */ | 353 | * it handle), it dies with this cryptic error message. */ |
| 346 | kill_guest(cpu, "unhandled trap %li at %#lx (%#lx)", | 354 | kill_guest(cpu, "unhandled trap %li at %#lx (%#lx)", |
| 347 | cpu->regs->trapnum, cpu->regs->eip, | 355 | cpu->regs->trapnum, cpu->regs->eip, |
| 348 | cpu->regs->trapnum == 14 ? cpu->arch.last_pagefault | 356 | cpu->regs->trapnum == 14 ? cpu->arch.last_pagefault |
| @@ -375,8 +383,8 @@ void __init lguest_arch_host_init(void) | |||
| 375 | * The only exception is the interrupt handlers in switcher.S: their | 383 | * The only exception is the interrupt handlers in switcher.S: their |
| 376 | * addresses are placed in a table (default_idt_entries), so we need to | 384 | * addresses are placed in a table (default_idt_entries), so we need to |
| 377 | * update the table with the new addresses. switcher_offset() is a | 385 | * update the table with the new addresses. switcher_offset() is a |
| 378 | * convenience function which returns the distance between the builtin | 386 | * convenience function which returns the distance between the |
| 379 | * switcher code and the high-mapped copy we just made. */ | 387 | * compiled-in switcher code and the high-mapped copy we just made. */ |
| 380 | for (i = 0; i < IDT_ENTRIES; i++) | 388 | for (i = 0; i < IDT_ENTRIES; i++) |
| 381 | default_idt_entries[i] += switcher_offset(); | 389 | default_idt_entries[i] += switcher_offset(); |
| 382 | 390 | ||
| @@ -416,7 +424,7 @@ void __init lguest_arch_host_init(void) | |||
| 416 | state->guest_gdt_desc.address = (long)&state->guest_gdt; | 424 | state->guest_gdt_desc.address = (long)&state->guest_gdt; |
| 417 | 425 | ||
| 418 | /* We know where we want the stack to be when the Guest enters | 426 | /* We know where we want the stack to be when the Guest enters |
| 419 | * the switcher: in pages->regs. The stack grows upwards, so | 427 | * the Switcher: in pages->regs. The stack grows upwards, so |
| 420 | * we start it at the end of that structure. */ | 428 | * we start it at the end of that structure. */ |
| 421 | state->guest_tss.sp0 = (long)(&pages->regs + 1); | 429 | state->guest_tss.sp0 = (long)(&pages->regs + 1); |
| 422 | /* And this is the GDT entry to use for the stack: we keep a | 430 | /* And this is the GDT entry to use for the stack: we keep a |
| @@ -513,8 +521,8 @@ int lguest_arch_init_hypercalls(struct lg_cpu *cpu) | |||
| 513 | { | 521 | { |
| 514 | u32 tsc_speed; | 522 | u32 tsc_speed; |
| 515 | 523 | ||
| 516 | /* The pointer to the Guest's "struct lguest_data" is the only | 524 | /* The pointer to the Guest's "struct lguest_data" is the only argument. |
| 517 | * argument. We check that address now. */ | 525 | * We check that address now. */ |
| 518 | if (!lguest_address_ok(cpu->lg, cpu->hcall->arg1, | 526 | if (!lguest_address_ok(cpu->lg, cpu->hcall->arg1, |
| 519 | sizeof(*cpu->lg->lguest_data))) | 527 | sizeof(*cpu->lg->lguest_data))) |
| 520 | return -EFAULT; | 528 | return -EFAULT; |
| @@ -546,6 +554,7 @@ int lguest_arch_init_hypercalls(struct lg_cpu *cpu) | |||
| 546 | 554 | ||
| 547 | return 0; | 555 | return 0; |
| 548 | } | 556 | } |
| 557 | /*:*/ | ||
| 549 | 558 | ||
| 550 | /*L:030 lguest_arch_setup_regs() | 559 | /*L:030 lguest_arch_setup_regs() |
| 551 | * | 560 | * |
diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S index 0af8baaa0d4a..3fc15318a80f 100644 --- a/drivers/lguest/x86/switcher_32.S +++ b/drivers/lguest/x86/switcher_32.S | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /*P:900 This is the Switcher: code which sits at 0xFFC00000 to do the low-level | 1 | /*P:900 This is the Switcher: code which sits at 0xFFC00000 astride both the |
| 2 | * Guest<->Host switch. It is as simple as it can be made, but it's naturally | 2 | * Host and Guest to do the low-level Guest<->Host switch. It is as simple as |
| 3 | * very specific to x86. | 3 | * it can be made, but it's naturally very specific to x86. |
| 4 | * | 4 | * |
| 5 | * You have now completed Preparation. If this has whet your appetite; if you | 5 | * You have now completed Preparation. If this has whet your appetite; if you |
| 6 | * are feeling invigorated and refreshed then the next, more challenging stage | 6 | * are feeling invigorated and refreshed then the next, more challenging stage |
| @@ -189,7 +189,7 @@ ENTRY(switch_to_guest) | |||
| 189 | // Interrupts are turned back on: we are Guest. | 189 | // Interrupts are turned back on: we are Guest. |
| 190 | iret | 190 | iret |
| 191 | 191 | ||
| 192 | // We treat two paths to switch back to the Host | 192 | // We tread two paths to switch back to the Host |
| 193 | // Yet both must save Guest state and restore Host | 193 | // Yet both must save Guest state and restore Host |
| 194 | // So we put the routine in a macro. | 194 | // So we put the routine in a macro. |
| 195 | #define SWITCH_TO_HOST \ | 195 | #define SWITCH_TO_HOST \ |
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index b04f98df94ea..835def11419d 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2003 Christophe Saout <christophe@saout.de> | 2 | * Copyright (C) 2003 Christophe Saout <christophe@saout.de> |
| 3 | * Copyright (C) 2004 Clemens Fruhwirth <clemens@endorphin.org> | 3 | * Copyright (C) 2004 Clemens Fruhwirth <clemens@endorphin.org> |
| 4 | * Copyright (C) 2006-2007 Red Hat, Inc. All rights reserved. | 4 | * Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved. |
| 5 | * | 5 | * |
| 6 | * This file is released under the GPL. | 6 | * This file is released under the GPL. |
| 7 | */ | 7 | */ |
| @@ -93,6 +93,8 @@ struct crypt_config { | |||
| 93 | 93 | ||
| 94 | struct workqueue_struct *io_queue; | 94 | struct workqueue_struct *io_queue; |
| 95 | struct workqueue_struct *crypt_queue; | 95 | struct workqueue_struct *crypt_queue; |
| 96 | wait_queue_head_t writeq; | ||
| 97 | |||
| 96 | /* | 98 | /* |
| 97 | * crypto related data | 99 | * crypto related data |
| 98 | */ | 100 | */ |
| @@ -331,14 +333,7 @@ static void crypt_convert_init(struct crypt_config *cc, | |||
| 331 | ctx->idx_out = bio_out ? bio_out->bi_idx : 0; | 333 | ctx->idx_out = bio_out ? bio_out->bi_idx : 0; |
| 332 | ctx->sector = sector + cc->iv_offset; | 334 | ctx->sector = sector + cc->iv_offset; |
| 333 | init_completion(&ctx->restart); | 335 | init_completion(&ctx->restart); |
| 334 | /* | 336 | atomic_set(&ctx->pending, 1); |
| 335 | * Crypto operation can be asynchronous, | ||
| 336 | * ctx->pending is increased after request submission. | ||
| 337 | * We need to ensure that we don't call the crypt finish | ||
| 338 | * operation before pending got incremented | ||
| 339 | * (dependent on crypt submission return code). | ||
| 340 | */ | ||
| 341 | atomic_set(&ctx->pending, 2); | ||
| 342 | } | 337 | } |
| 343 | 338 | ||
| 344 | static int crypt_convert_block(struct crypt_config *cc, | 339 | static int crypt_convert_block(struct crypt_config *cc, |
| @@ -411,43 +406,42 @@ static void crypt_alloc_req(struct crypt_config *cc, | |||
| 411 | static int crypt_convert(struct crypt_config *cc, | 406 | static int crypt_convert(struct crypt_config *cc, |
| 412 | struct convert_context *ctx) | 407 | struct convert_context *ctx) |
| 413 | { | 408 | { |
| 414 | int r = 0; | 409 | int r; |
| 415 | 410 | ||
| 416 | while(ctx->idx_in < ctx->bio_in->bi_vcnt && | 411 | while(ctx->idx_in < ctx->bio_in->bi_vcnt && |
| 417 | ctx->idx_out < ctx->bio_out->bi_vcnt) { | 412 | ctx->idx_out < ctx->bio_out->bi_vcnt) { |
| 418 | 413 | ||
| 419 | crypt_alloc_req(cc, ctx); | 414 | crypt_alloc_req(cc, ctx); |
| 420 | 415 | ||
| 416 | atomic_inc(&ctx->pending); | ||
| 417 | |||
| 421 | r = crypt_convert_block(cc, ctx, cc->req); | 418 | r = crypt_convert_block(cc, ctx, cc->req); |
| 422 | 419 | ||
| 423 | switch (r) { | 420 | switch (r) { |
| 421 | /* async */ | ||
| 424 | case -EBUSY: | 422 | case -EBUSY: |
| 425 | wait_for_completion(&ctx->restart); | 423 | wait_for_completion(&ctx->restart); |
| 426 | INIT_COMPLETION(ctx->restart); | 424 | INIT_COMPLETION(ctx->restart); |
| 427 | /* fall through*/ | 425 | /* fall through*/ |
| 428 | case -EINPROGRESS: | 426 | case -EINPROGRESS: |
| 429 | atomic_inc(&ctx->pending); | ||
| 430 | cc->req = NULL; | 427 | cc->req = NULL; |
| 431 | r = 0; | 428 | ctx->sector++; |
| 432 | /* fall through*/ | 429 | continue; |
| 430 | |||
| 431 | /* sync */ | ||
| 433 | case 0: | 432 | case 0: |
| 433 | atomic_dec(&ctx->pending); | ||
| 434 | ctx->sector++; | 434 | ctx->sector++; |
| 435 | continue; | 435 | continue; |
| 436 | } | ||
| 437 | 436 | ||
| 438 | break; | 437 | /* error */ |
| 438 | default: | ||
| 439 | atomic_dec(&ctx->pending); | ||
| 440 | return r; | ||
| 441 | } | ||
| 439 | } | 442 | } |
| 440 | 443 | ||
| 441 | /* | 444 | return 0; |
| 442 | * If there are pending crypto operation run async | ||
| 443 | * code. Otherwise process return code synchronously. | ||
| 444 | * The step of 2 ensures that async finish doesn't | ||
| 445 | * call crypto finish too early. | ||
| 446 | */ | ||
| 447 | if (atomic_sub_return(2, &ctx->pending)) | ||
| 448 | return -EINPROGRESS; | ||
| 449 | |||
| 450 | return r; | ||
| 451 | } | 445 | } |
| 452 | 446 | ||
| 453 | static void dm_crypt_bio_destructor(struct bio *bio) | 447 | static void dm_crypt_bio_destructor(struct bio *bio) |
| @@ -624,8 +618,10 @@ static void kcryptd_io_read(struct dm_crypt_io *io) | |||
| 624 | static void kcryptd_io_write(struct dm_crypt_io *io) | 618 | static void kcryptd_io_write(struct dm_crypt_io *io) |
| 625 | { | 619 | { |
| 626 | struct bio *clone = io->ctx.bio_out; | 620 | struct bio *clone = io->ctx.bio_out; |
| 621 | struct crypt_config *cc = io->target->private; | ||
| 627 | 622 | ||
| 628 | generic_make_request(clone); | 623 | generic_make_request(clone); |
| 624 | wake_up(&cc->writeq); | ||
| 629 | } | 625 | } |
| 630 | 626 | ||
| 631 | static void kcryptd_io(struct work_struct *work) | 627 | static void kcryptd_io(struct work_struct *work) |
| @@ -698,7 +694,8 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io) | |||
| 698 | 694 | ||
| 699 | r = crypt_convert(cc, &io->ctx); | 695 | r = crypt_convert(cc, &io->ctx); |
| 700 | 696 | ||
| 701 | if (r != -EINPROGRESS) { | 697 | if (atomic_dec_and_test(&io->ctx.pending)) { |
| 698 | /* processed, no running async crypto */ | ||
| 702 | kcryptd_crypt_write_io_submit(io, r, 0); | 699 | kcryptd_crypt_write_io_submit(io, r, 0); |
| 703 | if (unlikely(r < 0)) | 700 | if (unlikely(r < 0)) |
| 704 | return; | 701 | return; |
| @@ -706,8 +703,12 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io) | |||
| 706 | atomic_inc(&io->pending); | 703 | atomic_inc(&io->pending); |
| 707 | 704 | ||
| 708 | /* out of memory -> run queues */ | 705 | /* out of memory -> run queues */ |
| 709 | if (unlikely(remaining)) | 706 | if (unlikely(remaining)) { |
| 707 | /* wait for async crypto then reinitialize pending */ | ||
| 708 | wait_event(cc->writeq, !atomic_read(&io->ctx.pending)); | ||
| 709 | atomic_set(&io->ctx.pending, 1); | ||
| 710 | congestion_wait(WRITE, HZ/100); | 710 | congestion_wait(WRITE, HZ/100); |
| 711 | } | ||
| 711 | } | 712 | } |
| 712 | } | 713 | } |
| 713 | 714 | ||
| @@ -746,7 +747,7 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io) | |||
| 746 | 747 | ||
| 747 | r = crypt_convert(cc, &io->ctx); | 748 | r = crypt_convert(cc, &io->ctx); |
| 748 | 749 | ||
| 749 | if (r != -EINPROGRESS) | 750 | if (atomic_dec_and_test(&io->ctx.pending)) |
| 750 | kcryptd_crypt_read_done(io, r); | 751 | kcryptd_crypt_read_done(io, r); |
| 751 | 752 | ||
| 752 | crypt_dec_pending(io); | 753 | crypt_dec_pending(io); |
| @@ -1047,6 +1048,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) | |||
| 1047 | goto bad_crypt_queue; | 1048 | goto bad_crypt_queue; |
| 1048 | } | 1049 | } |
| 1049 | 1050 | ||
| 1051 | init_waitqueue_head(&cc->writeq); | ||
| 1050 | ti->private = cc; | 1052 | ti->private = cc; |
| 1051 | return 0; | 1053 | return 0; |
| 1052 | 1054 | ||
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index b8e342fe7586..8f25f628ef16 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c | |||
| @@ -114,7 +114,7 @@ static void dec_count(struct io *io, unsigned int region, int error) | |||
| 114 | wake_up_process(io->sleeper); | 114 | wake_up_process(io->sleeper); |
| 115 | 115 | ||
| 116 | else { | 116 | else { |
| 117 | int r = io->error; | 117 | unsigned long r = io->error; |
| 118 | io_notify_fn fn = io->callback; | 118 | io_notify_fn fn = io->callback; |
| 119 | void *context = io->context; | 119 | void *context = io->context; |
| 120 | 120 | ||
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index 51605870f898..762cb086bb7f 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c | |||
| @@ -753,7 +753,7 @@ out: | |||
| 753 | * are in the no-sync state. We have to recover these by | 753 | * are in the no-sync state. We have to recover these by |
| 754 | * recopying from the default mirror to all the others. | 754 | * recopying from the default mirror to all the others. |
| 755 | *---------------------------------------------------------------*/ | 755 | *---------------------------------------------------------------*/ |
| 756 | static void recovery_complete(int read_err, unsigned int write_err, | 756 | static void recovery_complete(int read_err, unsigned long write_err, |
| 757 | void *context) | 757 | void *context) |
| 758 | { | 758 | { |
| 759 | struct region *reg = (struct region *)context; | 759 | struct region *reg = (struct region *)context; |
| @@ -767,7 +767,7 @@ static void recovery_complete(int read_err, unsigned int write_err, | |||
| 767 | } | 767 | } |
| 768 | 768 | ||
| 769 | if (write_err) { | 769 | if (write_err) { |
| 770 | DMERR_LIMIT("Write error during recovery (error = 0x%x)", | 770 | DMERR_LIMIT("Write error during recovery (error = 0x%lx)", |
| 771 | write_err); | 771 | write_err); |
| 772 | /* | 772 | /* |
| 773 | * Bits correspond to devices (excluding default mirror). | 773 | * Bits correspond to devices (excluding default mirror). |
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index ae24eab8cd81..4dc8a43c034b 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c | |||
| @@ -804,7 +804,7 @@ static void commit_callback(void *context, int success) | |||
| 804 | * Called when the copy I/O has finished. kcopyd actually runs | 804 | * Called when the copy I/O has finished. kcopyd actually runs |
| 805 | * this code so don't block. | 805 | * this code so don't block. |
| 806 | */ | 806 | */ |
| 807 | static void copy_callback(int read_err, unsigned int write_err, void *context) | 807 | static void copy_callback(int read_err, unsigned long write_err, void *context) |
| 808 | { | 808 | { |
| 809 | struct dm_snap_pending_exception *pe = context; | 809 | struct dm_snap_pending_exception *pe = context; |
| 810 | struct dm_snapshot *s = pe->snap; | 810 | struct dm_snapshot *s = pe->snap; |
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c index f3831f31223e..e76b52ade690 100644 --- a/drivers/md/kcopyd.c +++ b/drivers/md/kcopyd.c | |||
| @@ -169,7 +169,7 @@ struct kcopyd_job { | |||
| 169 | * Error state of the job. | 169 | * Error state of the job. |
| 170 | */ | 170 | */ |
| 171 | int read_err; | 171 | int read_err; |
| 172 | unsigned int write_err; | 172 | unsigned long write_err; |
| 173 | 173 | ||
| 174 | /* | 174 | /* |
| 175 | * Either READ or WRITE | 175 | * Either READ or WRITE |
| @@ -293,7 +293,7 @@ static int run_complete_job(struct kcopyd_job *job) | |||
| 293 | { | 293 | { |
| 294 | void *context = job->context; | 294 | void *context = job->context; |
| 295 | int read_err = job->read_err; | 295 | int read_err = job->read_err; |
| 296 | unsigned int write_err = job->write_err; | 296 | unsigned long write_err = job->write_err; |
| 297 | kcopyd_notify_fn fn = job->fn; | 297 | kcopyd_notify_fn fn = job->fn; |
| 298 | struct kcopyd_client *kc = job->kc; | 298 | struct kcopyd_client *kc = job->kc; |
| 299 | 299 | ||
| @@ -396,7 +396,7 @@ static int process_jobs(struct list_head *jobs, int (*fn) (struct kcopyd_job *)) | |||
| 396 | if (r < 0) { | 396 | if (r < 0) { |
| 397 | /* error this rogue job */ | 397 | /* error this rogue job */ |
| 398 | if (job->rw == WRITE) | 398 | if (job->rw == WRITE) |
| 399 | job->write_err = (unsigned int) -1; | 399 | job->write_err = (unsigned long) -1L; |
| 400 | else | 400 | else |
| 401 | job->read_err = 1; | 401 | job->read_err = 1; |
| 402 | push(&_complete_jobs, job); | 402 | push(&_complete_jobs, job); |
| @@ -448,8 +448,8 @@ static void dispatch_job(struct kcopyd_job *job) | |||
| 448 | } | 448 | } |
| 449 | 449 | ||
| 450 | #define SUB_JOB_SIZE 128 | 450 | #define SUB_JOB_SIZE 128 |
| 451 | static void segment_complete(int read_err, | 451 | static void segment_complete(int read_err, unsigned long write_err, |
| 452 | unsigned int write_err, void *context) | 452 | void *context) |
| 453 | { | 453 | { |
| 454 | /* FIXME: tidy this function */ | 454 | /* FIXME: tidy this function */ |
| 455 | sector_t progress = 0; | 455 | sector_t progress = 0; |
diff --git a/drivers/md/kcopyd.h b/drivers/md/kcopyd.h index 4621ea055c0e..4845f2a0c676 100644 --- a/drivers/md/kcopyd.h +++ b/drivers/md/kcopyd.h | |||
| @@ -32,8 +32,8 @@ void kcopyd_client_destroy(struct kcopyd_client *kc); | |||
| 32 | * read_err is a boolean, | 32 | * read_err is a boolean, |
| 33 | * write_err is a bitset, with 1 bit for each destination region | 33 | * write_err is a bitset, with 1 bit for each destination region |
| 34 | */ | 34 | */ |
| 35 | typedef void (*kcopyd_notify_fn)(int read_err, | 35 | typedef void (*kcopyd_notify_fn)(int read_err, unsigned long write_err, |
| 36 | unsigned int write_err, void *context); | 36 | void *context); |
| 37 | 37 | ||
| 38 | int kcopyd_copy(struct kcopyd_client *kc, struct io_region *from, | 38 | int kcopyd_copy(struct kcopyd_client *kc, struct io_region *from, |
| 39 | unsigned int num_dests, struct io_region *dests, | 39 | unsigned int num_dests, struct io_region *dests, |
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c index 168a8d3a5e55..7707b8c7394b 100644 --- a/drivers/media/common/saa7146_core.c +++ b/drivers/media/common/saa7146_core.c | |||
| @@ -306,25 +306,22 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id) | |||
| 306 | return IRQ_NONE; | 306 | return IRQ_NONE; |
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | if( 0 != (dev->ext)) { | 309 | if (dev->ext) { |
| 310 | if( 0 != (dev->ext->irq_mask & isr )) { | 310 | if (dev->ext->irq_mask & isr) { |
| 311 | if( 0 != dev->ext->irq_func ) { | 311 | if (dev->ext->irq_func) |
| 312 | dev->ext->irq_func(dev, &isr); | 312 | dev->ext->irq_func(dev, &isr); |
| 313 | } | ||
| 314 | isr &= ~dev->ext->irq_mask; | 313 | isr &= ~dev->ext->irq_mask; |
| 315 | } | 314 | } |
| 316 | } | 315 | } |
| 317 | if (0 != (isr & (MASK_27))) { | 316 | if (0 != (isr & (MASK_27))) { |
| 318 | DEB_INT(("irq: RPS0 (0x%08x).\n",isr)); | 317 | DEB_INT(("irq: RPS0 (0x%08x).\n",isr)); |
| 319 | if( 0 != dev->vv_data && 0 != dev->vv_callback) { | 318 | if (dev->vv_data && dev->vv_callback) |
| 320 | dev->vv_callback(dev,isr); | 319 | dev->vv_callback(dev,isr); |
| 321 | } | ||
| 322 | isr &= ~MASK_27; | 320 | isr &= ~MASK_27; |
| 323 | } | 321 | } |
| 324 | if (0 != (isr & (MASK_28))) { | 322 | if (0 != (isr & (MASK_28))) { |
| 325 | if( 0 != dev->vv_data && 0 != dev->vv_callback) { | 323 | if (dev->vv_data && dev->vv_callback) |
| 326 | dev->vv_callback(dev,isr); | 324 | dev->vv_callback(dev,isr); |
| 327 | } | ||
| 328 | isr &= ~MASK_28; | 325 | isr &= ~MASK_28; |
| 329 | } | 326 | } |
| 330 | if (0 != (isr & (MASK_16|MASK_17))) { | 327 | if (0 != (isr & (MASK_16|MASK_17))) { |
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index f0703d8bc3e8..171afe7da6b6 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
| @@ -272,7 +272,7 @@ static int fops_open(struct inode *inode, struct file *file) | |||
| 272 | 272 | ||
| 273 | result = 0; | 273 | result = 0; |
| 274 | out: | 274 | out: |
| 275 | if( fh != 0 && result != 0 ) { | 275 | if (fh && result != 0) { |
| 276 | kfree(fh); | 276 | kfree(fh); |
| 277 | file->private_data = NULL; | 277 | file->private_data = NULL; |
| 278 | } | 278 | } |
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index ed3f8268ed11..4c8b62e2c035 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
| @@ -784,8 +784,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len, | |||
| 784 | { | 784 | { |
| 785 | struct net_device *dev = feed->priv; | 785 | struct net_device *dev = feed->priv; |
| 786 | 786 | ||
| 787 | if (buffer2 != 0) | 787 | if (buffer2) |
| 788 | printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2); | 788 | printk(KERN_WARNING "buffer2 not NULL: %p.\n", buffer2); |
| 789 | if (buffer1_len > 32768) | 789 | if (buffer1_len > 32768) |
| 790 | printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len); | 790 | printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len); |
| 791 | /* printk("TS callback: %u bytes, %u TS cells @ %p.\n", | 791 | /* printk("TS callback: %u bytes, %u TS cells @ %p.\n", |
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c index cbab53fc6243..fea2e723e34b 100644 --- a/drivers/media/video/adv7170.c +++ b/drivers/media/video/adv7170.c | |||
| @@ -408,7 +408,7 @@ adv7170_detect_client (struct i2c_adapter *adapter, | |||
| 408 | return 0; | 408 | return 0; |
| 409 | 409 | ||
| 410 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 410 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 411 | if (client == 0) | 411 | if (!client) |
| 412 | return -ENOMEM; | 412 | return -ENOMEM; |
| 413 | client->addr = address; | 413 | client->addr = address; |
| 414 | client->adapter = adapter; | 414 | client->adapter = adapter; |
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c index 0d0c554bfdf7..10d4d89623f1 100644 --- a/drivers/media/video/adv7175.c +++ b/drivers/media/video/adv7175.c | |||
| @@ -426,7 +426,7 @@ adv7175_detect_client (struct i2c_adapter *adapter, | |||
| 426 | return 0; | 426 | return 0; |
| 427 | 427 | ||
| 428 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 428 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 429 | if (client == 0) | 429 | if (!client) |
| 430 | return -ENOMEM; | 430 | return -ENOMEM; |
| 431 | client->addr = address; | 431 | client->addr = address; |
| 432 | client->adapter = adapter; | 432 | client->adapter = adapter; |
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c index 12d1b9248be5..e663cc045c41 100644 --- a/drivers/media/video/bt819.c +++ b/drivers/media/video/bt819.c | |||
| @@ -524,7 +524,7 @@ bt819_detect_client (struct i2c_adapter *adapter, | |||
| 524 | return 0; | 524 | return 0; |
| 525 | 525 | ||
| 526 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 526 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 527 | if (client == 0) | 527 | if (!client) |
| 528 | return -ENOMEM; | 528 | return -ENOMEM; |
| 529 | client->addr = address; | 529 | client->addr = address; |
| 530 | client->adapter = adapter; | 530 | client->adapter = adapter; |
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index e1028a76c042..7dee2e3235ad 100644 --- a/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c | |||
| @@ -311,7 +311,7 @@ bt856_detect_client (struct i2c_adapter *adapter, | |||
| 311 | return 0; | 311 | return 0; |
| 312 | 312 | ||
| 313 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 313 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 314 | if (client == 0) | 314 | if (!client) |
| 315 | return -ENOMEM; | 315 | return -ENOMEM; |
| 316 | client->addr = address; | 316 | client->addr = address; |
| 317 | client->adapter = adapter; | 317 | client->adapter = adapter; |
diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c index 566e479e2629..9ceb6b2f3949 100644 --- a/drivers/media/video/dpc7146.c +++ b/drivers/media/video/dpc7146.c | |||
| @@ -131,7 +131,7 @@ static int dpc_probe(struct saa7146_dev* dev) | |||
| 131 | device_for_each_child(&dpc->i2c_adapter.dev, dpc, dpc_check_clients); | 131 | device_for_each_child(&dpc->i2c_adapter.dev, dpc, dpc_check_clients); |
| 132 | 132 | ||
| 133 | /* check if all devices are present */ | 133 | /* check if all devices are present */ |
| 134 | if( 0 == dpc->saa7111a ) { | 134 | if (!dpc->saa7111a) { |
| 135 | DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n")); | 135 | DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n")); |
| 136 | i2c_del_adapter(&dpc->i2c_adapter); | 136 | i2c_del_adapter(&dpc->i2c_adapter); |
| 137 | kfree(dpc); | 137 | kfree(dpc); |
diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c index 58bab653330f..74fd6a01d4c4 100644 --- a/drivers/media/video/mt20xx.c +++ b/drivers/media/video/mt20xx.c | |||
| @@ -647,7 +647,7 @@ struct dvb_frontend *microtune_attach(struct dvb_frontend *fe, | |||
| 647 | default: | 647 | default: |
| 648 | tuner_info("microtune %s found, not (yet?) supported, sorry :-/\n", | 648 | tuner_info("microtune %s found, not (yet?) supported, sorry :-/\n", |
| 649 | name); | 649 | name); |
| 650 | return 0; | 650 | return NULL; |
| 651 | } | 651 | } |
| 652 | 652 | ||
| 653 | strlcpy(fe->ops.tuner_ops.info.name, name, | 653 | strlcpy(fe->ops.tuner_ops.info.name, name, |
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index add6d0d680be..cb5a510f9251 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c | |||
| @@ -221,9 +221,8 @@ static int mxb_probe(struct saa7146_dev* dev) | |||
| 221 | device_for_each_child(&mxb->i2c_adapter.dev, mxb, mxb_check_clients); | 221 | device_for_each_child(&mxb->i2c_adapter.dev, mxb, mxb_check_clients); |
| 222 | 222 | ||
| 223 | /* check if all devices are present */ | 223 | /* check if all devices are present */ |
| 224 | if( 0 == mxb->tea6420_1 || 0 == mxb->tea6420_2 || 0 == mxb->tea6415c | 224 | if (!mxb->tea6420_1 || !mxb->tea6420_2 || !mxb->tea6415c || |
| 225 | || 0 == mxb->tda9840 || 0 == mxb->saa7111a || 0 == mxb->tuner ) { | 225 | !mxb->tda9840 || !mxb->saa7111a || !mxb->tuner) { |
| 226 | |||
| 227 | printk("mxb: did not find all i2c devices. aborting\n"); | 226 | printk("mxb: did not find all i2c devices. aborting\n"); |
| 228 | i2c_del_adapter(&mxb->i2c_adapter); | 227 | i2c_del_adapter(&mxb->i2c_adapter); |
| 229 | kfree(mxb); | 228 | kfree(mxb); |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c index 46f156fb108c..5a3e8d21a38a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c +++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c | |||
| @@ -60,7 +60,7 @@ int pvr2_ctrl_set_mask_value(struct pvr2_ctrl *cptr,int mask,int val) | |||
| 60 | int ret = 0; | 60 | int ret = 0; |
| 61 | if (!cptr) return -EINVAL; | 61 | if (!cptr) return -EINVAL; |
| 62 | LOCK_TAKE(cptr->hdw->big_lock); do { | 62 | LOCK_TAKE(cptr->hdw->big_lock); do { |
| 63 | if (cptr->info->set_value != 0) { | 63 | if (cptr->info->set_value) { |
| 64 | if (cptr->info->type == pvr2_ctl_bitmask) { | 64 | if (cptr->info->type == pvr2_ctl_bitmask) { |
| 65 | mask &= cptr->info->def.type_bitmask.valid_bits; | 65 | mask &= cptr->info->def.type_bitmask.valid_bits; |
| 66 | } else if (cptr->info->type == pvr2_ctl_int) { | 66 | } else if (cptr->info->type == pvr2_ctl_int) { |
| @@ -265,7 +265,7 @@ unsigned int pvr2_ctrl_get_v4lflags(struct pvr2_ctrl *cptr) | |||
| 265 | int pvr2_ctrl_is_writable(struct pvr2_ctrl *cptr) | 265 | int pvr2_ctrl_is_writable(struct pvr2_ctrl *cptr) |
| 266 | { | 266 | { |
| 267 | if (!cptr) return 0; | 267 | if (!cptr) return 0; |
| 268 | return cptr->info->set_value != 0; | 268 | return cptr->info->set_value != NULL; |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | 271 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 41ae980405ed..d6955fa39598 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
| @@ -2291,7 +2291,7 @@ static int pvr2_hdw_commit_setup(struct pvr2_hdw *hdw) | |||
| 2291 | 2291 | ||
| 2292 | for (idx = 0; idx < hdw->control_cnt; idx++) { | 2292 | for (idx = 0; idx < hdw->control_cnt; idx++) { |
| 2293 | cptr = hdw->controls + idx; | 2293 | cptr = hdw->controls + idx; |
| 2294 | if (cptr->info->is_dirty == 0) continue; | 2294 | if (!cptr->info->is_dirty) continue; |
| 2295 | if (!cptr->info->is_dirty(cptr)) continue; | 2295 | if (!cptr->info->is_dirty(cptr)) continue; |
| 2296 | commit_flag = !0; | 2296 | commit_flag = !0; |
| 2297 | 2297 | ||
| @@ -2646,7 +2646,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw, | |||
| 2646 | u16 address; | 2646 | u16 address; |
| 2647 | unsigned int pipe; | 2647 | unsigned int pipe; |
| 2648 | LOCK_TAKE(hdw->big_lock); do { | 2648 | LOCK_TAKE(hdw->big_lock); do { |
| 2649 | if ((hdw->fw_buffer == 0) == !enable_flag) break; | 2649 | if ((hdw->fw_buffer == NULL) == !enable_flag) break; |
| 2650 | 2650 | ||
| 2651 | if (!enable_flag) { | 2651 | if (!enable_flag) { |
| 2652 | pvr2_trace(PVR2_TRACE_FIRMWARE, | 2652 | pvr2_trace(PVR2_TRACE_FIRMWARE, |
| @@ -2715,7 +2715,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw, | |||
| 2715 | /* Return true if we're in a mode for retrieval CPU firmware */ | 2715 | /* Return true if we're in a mode for retrieval CPU firmware */ |
| 2716 | int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *hdw) | 2716 | int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *hdw) |
| 2717 | { | 2717 | { |
| 2718 | return hdw->fw_buffer != 0; | 2718 | return hdw->fw_buffer != NULL; |
| 2719 | } | 2719 | } |
| 2720 | 2720 | ||
| 2721 | 2721 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c index ce3c8982ffe0..a9889ff96ecc 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-io.c +++ b/drivers/media/video/pvrusb2/pvrusb2-io.c | |||
| @@ -563,7 +563,7 @@ void pvr2_stream_kill(struct pvr2_stream *sp) | |||
| 563 | struct pvr2_buffer *bp; | 563 | struct pvr2_buffer *bp; |
| 564 | mutex_lock(&sp->mutex); do { | 564 | mutex_lock(&sp->mutex); do { |
| 565 | pvr2_stream_internal_flush(sp); | 565 | pvr2_stream_internal_flush(sp); |
| 566 | while ((bp = pvr2_stream_get_ready_buffer(sp)) != 0) { | 566 | while ((bp = pvr2_stream_get_ready_buffer(sp)) != NULL) { |
| 567 | pvr2_buffer_set_idle(bp); | 567 | pvr2_buffer_set_idle(bp); |
| 568 | } | 568 | } |
| 569 | if (sp->buffer_total_count != sp->buffer_target_count) { | 569 | if (sp->buffer_total_count != sp->buffer_target_count) { |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/video/pvrusb2/pvrusb2-ioread.c index f782418afa45..c572212c9f15 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ioread.c +++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.c | |||
| @@ -165,7 +165,7 @@ static int pvr2_ioread_start(struct pvr2_ioread *cp) | |||
| 165 | if (!(cp->stream)) return 0; | 165 | if (!(cp->stream)) return 0; |
| 166 | pvr2_trace(PVR2_TRACE_START_STOP, | 166 | pvr2_trace(PVR2_TRACE_START_STOP, |
| 167 | "/*---TRACE_READ---*/ pvr2_ioread_start id=%p",cp); | 167 | "/*---TRACE_READ---*/ pvr2_ioread_start id=%p",cp); |
| 168 | while ((bp = pvr2_stream_get_idle_buffer(cp->stream)) != 0) { | 168 | while ((bp = pvr2_stream_get_idle_buffer(cp->stream)) != NULL) { |
| 169 | stat = pvr2_buffer_queue(bp); | 169 | stat = pvr2_buffer_queue(bp); |
| 170 | if (stat < 0) { | 170 | if (stat < 0) { |
| 171 | pvr2_trace(PVR2_TRACE_DATA_FLOW, | 171 | pvr2_trace(PVR2_TRACE_DATA_FLOW, |
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index f991d72fe108..e0a453a6543d 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
| @@ -915,7 +915,7 @@ static void pwc_iso_stop(struct pwc_device *pdev) | |||
| 915 | struct urb *urb; | 915 | struct urb *urb; |
| 916 | 916 | ||
| 917 | urb = pdev->sbuf[i].urb; | 917 | urb = pdev->sbuf[i].urb; |
| 918 | if (urb != 0) { | 918 | if (urb) { |
| 919 | PWC_DEBUG_MEMORY("Unlinking URB %p\n", urb); | 919 | PWC_DEBUG_MEMORY("Unlinking URB %p\n", urb); |
| 920 | usb_kill_urb(urb); | 920 | usb_kill_urb(urb); |
| 921 | } | 921 | } |
| @@ -931,7 +931,7 @@ static void pwc_iso_free(struct pwc_device *pdev) | |||
| 931 | struct urb *urb; | 931 | struct urb *urb; |
| 932 | 932 | ||
| 933 | urb = pdev->sbuf[i].urb; | 933 | urb = pdev->sbuf[i].urb; |
| 934 | if (urb != 0) { | 934 | if (urb) { |
| 935 | PWC_DEBUG_MEMORY("Freeing URB\n"); | 935 | PWC_DEBUG_MEMORY("Freeing URB\n"); |
| 936 | usb_free_urb(urb); | 936 | usb_free_urb(urb); |
| 937 | pdev->sbuf[i].urb = NULL; | 937 | pdev->sbuf[i].urb = NULL; |
| @@ -1759,8 +1759,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id | |||
| 1759 | 1759 | ||
| 1760 | /* Allocate video_device structure */ | 1760 | /* Allocate video_device structure */ |
| 1761 | pdev->vdev = video_device_alloc(); | 1761 | pdev->vdev = video_device_alloc(); |
| 1762 | if (pdev->vdev == 0) | 1762 | if (!pdev->vdev) { |
| 1763 | { | ||
| 1764 | PWC_ERROR("Err, cannot allocate video_device struture. Failing probe."); | 1763 | PWC_ERROR("Err, cannot allocate video_device struture. Failing probe."); |
| 1765 | kfree(pdev); | 1764 | kfree(pdev); |
| 1766 | return -ENOMEM; | 1765 | return -ENOMEM; |
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index 061134a7ba9f..1df2602cd184 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c | |||
| @@ -488,7 +488,7 @@ saa7110_detect_client (struct i2c_adapter *adapter, | |||
| 488 | return 0; | 488 | return 0; |
| 489 | 489 | ||
| 490 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 490 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 491 | if (client == 0) | 491 | if (!client) |
| 492 | return -ENOMEM; | 492 | return -ENOMEM; |
| 493 | client->addr = address; | 493 | client->addr = address; |
| 494 | client->adapter = adapter; | 494 | client->adapter = adapter; |
| @@ -496,7 +496,7 @@ saa7110_detect_client (struct i2c_adapter *adapter, | |||
| 496 | strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client))); | 496 | strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client))); |
| 497 | 497 | ||
| 498 | decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL); | 498 | decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL); |
| 499 | if (decoder == 0) { | 499 | if (!decoder) { |
| 500 | kfree(client); | 500 | kfree(client); |
| 501 | return -ENOMEM; | 501 | return -ENOMEM; |
| 502 | } | 502 | } |
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c index 7ae2d646d000..a0772c53bb1f 100644 --- a/drivers/media/video/saa7111.c +++ b/drivers/media/video/saa7111.c | |||
| @@ -502,7 +502,7 @@ saa7111_detect_client (struct i2c_adapter *adapter, | |||
| 502 | return 0; | 502 | return 0; |
| 503 | 503 | ||
| 504 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 504 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 505 | if (client == 0) | 505 | if (!client) |
| 506 | return -ENOMEM; | 506 | return -ENOMEM; |
| 507 | client->addr = address; | 507 | client->addr = address; |
| 508 | client->adapter = adapter; | 508 | client->adapter = adapter; |
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c index 677df51de1a9..bf91a4faa706 100644 --- a/drivers/media/video/saa7114.c +++ b/drivers/media/video/saa7114.c | |||
| @@ -841,7 +841,7 @@ saa7114_detect_client (struct i2c_adapter *adapter, | |||
| 841 | return 0; | 841 | return 0; |
| 842 | 842 | ||
| 843 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 843 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 844 | if (client == 0) | 844 | if (!client) |
| 845 | return -ENOMEM; | 845 | return -ENOMEM; |
| 846 | client->addr = address; | 846 | client->addr = address; |
| 847 | client->adapter = adapter; | 847 | client->adapter = adapter; |
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c index 66cc92c0ea66..41f70440fd3b 100644 --- a/drivers/media/video/saa7185.c +++ b/drivers/media/video/saa7185.c | |||
| @@ -403,7 +403,7 @@ saa7185_detect_client (struct i2c_adapter *adapter, | |||
| 403 | return 0; | 403 | return 0; |
| 404 | 404 | ||
| 405 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 405 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 406 | if (client == 0) | 406 | if (!client) |
| 407 | return -ENOMEM; | 407 | return -ENOMEM; |
| 408 | client->addr = address; | 408 | client->addr = address; |
| 409 | client->adapter = adapter; | 409 | client->adapter = adapter; |
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c index ef494febb5e4..bdca5d278978 100644 --- a/drivers/media/video/tda9840.c +++ b/drivers/media/video/tda9840.c | |||
| @@ -172,7 +172,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind) | |||
| 172 | 172 | ||
| 173 | /* allocate memory for client structure */ | 173 | /* allocate memory for client structure */ |
| 174 | client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); | 174 | client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 175 | if (0 == client) { | 175 | if (!client) { |
| 176 | printk("not enough kernel memory\n"); | 176 | printk("not enough kernel memory\n"); |
| 177 | return -ENOMEM; | 177 | return -ENOMEM; |
| 178 | } | 178 | } |
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c index 523df0b8cc63..df2fad9f391e 100644 --- a/drivers/media/video/tea6415c.c +++ b/drivers/media/video/tea6415c.c | |||
| @@ -64,7 +64,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind) | |||
| 64 | 64 | ||
| 65 | /* allocate memory for client structure */ | 65 | /* allocate memory for client structure */ |
| 66 | client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); | 66 | client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 67 | if (0 == client) { | 67 | if (!client) { |
| 68 | return -ENOMEM; | 68 | return -ENOMEM; |
| 69 | } | 69 | } |
| 70 | 70 | ||
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c index ca05cd655087..4ff6c63f7237 100644 --- a/drivers/media/video/tea6420.c +++ b/drivers/media/video/tea6420.c | |||
| @@ -101,7 +101,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind) | |||
| 101 | 101 | ||
| 102 | /* allocate memory for client structure */ | 102 | /* allocate memory for client structure */ |
| 103 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 103 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 104 | if (0 == client) { | 104 | if (!client) { |
| 105 | return -ENOMEM; | 105 | return -ENOMEM; |
| 106 | } | 106 | } |
| 107 | 107 | ||
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index d28318cb2b8d..b6e24e714a23 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
| @@ -1072,12 +1072,12 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter, | |||
| 1072 | return 0; | 1072 | return 0; |
| 1073 | 1073 | ||
| 1074 | c = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); | 1074 | c = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 1075 | if (c == 0) | 1075 | if (!c) |
| 1076 | return -ENOMEM; | 1076 | return -ENOMEM; |
| 1077 | memcpy(c, &client_template, sizeof(struct i2c_client)); | 1077 | memcpy(c, &client_template, sizeof(struct i2c_client)); |
| 1078 | 1078 | ||
| 1079 | core = kzalloc(sizeof(struct tvp5150), GFP_KERNEL); | 1079 | core = kzalloc(sizeof(struct tvp5150), GFP_KERNEL); |
| 1080 | if (core == 0) { | 1080 | if (!core) { |
| 1081 | kfree(c); | 1081 | kfree(c); |
| 1082 | return -ENOMEM; | 1082 | return -ENOMEM; |
| 1083 | } | 1083 | } |
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index dd3d7d2c8b0e..fea4946ee713 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
| @@ -339,7 +339,7 @@ v4l_fbuffer_alloc (struct file *file) | |||
| 339 | /* Use kmalloc */ | 339 | /* Use kmalloc */ |
| 340 | 340 | ||
| 341 | mem = kmalloc(fh->v4l_buffers.buffer_size, GFP_KERNEL); | 341 | mem = kmalloc(fh->v4l_buffers.buffer_size, GFP_KERNEL); |
| 342 | if (mem == 0) { | 342 | if (!mem) { |
| 343 | dprintk(1, | 343 | dprintk(1, |
| 344 | KERN_ERR | 344 | KERN_ERR |
| 345 | "%s: v4l_fbuffer_alloc() - kmalloc for V4L buf %d failed\n", | 345 | "%s: v4l_fbuffer_alloc() - kmalloc for V4L buf %d failed\n", |
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c index 1b44784d0efb..04949c823654 100644 --- a/drivers/media/video/zr364xx.c +++ b/drivers/media/video/zr364xx.c | |||
| @@ -390,7 +390,7 @@ static int read_frame(struct zr364xx_camera *cam, int framenum) | |||
| 390 | } | 390 | } |
| 391 | 391 | ||
| 392 | 392 | ||
| 393 | static ssize_t zr364xx_read(struct file *file, char *buf, size_t cnt, | 393 | static ssize_t zr364xx_read(struct file *file, char __user *buf, size_t cnt, |
| 394 | loff_t * ppos) | 394 | loff_t * ppos) |
| 395 | { | 395 | { |
| 396 | unsigned long count = cnt; | 396 | unsigned long count = cnt; |
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c index eb150dfb637f..8577de4ebb0e 100644 --- a/drivers/memstick/host/tifm_ms.c +++ b/drivers/memstick/host/tifm_ms.c | |||
| @@ -182,7 +182,7 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host) | |||
| 182 | struct tifm_dev *sock = host->dev; | 182 | struct tifm_dev *sock = host->dev; |
| 183 | unsigned int length; | 183 | unsigned int length; |
| 184 | unsigned int off; | 184 | unsigned int off; |
| 185 | unsigned int t_size, p_off, p_cnt; | 185 | unsigned int t_size, p_cnt; |
| 186 | unsigned char *buf; | 186 | unsigned char *buf; |
| 187 | struct page *pg; | 187 | struct page *pg; |
| 188 | unsigned long flags = 0; | 188 | unsigned long flags = 0; |
| @@ -198,6 +198,8 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host) | |||
| 198 | host->block_pos); | 198 | host->block_pos); |
| 199 | 199 | ||
| 200 | while (length) { | 200 | while (length) { |
| 201 | unsigned int uninitialized_var(p_off); | ||
| 202 | |||
| 201 | if (host->req->long_data) { | 203 | if (host->req->long_data) { |
| 202 | pg = nth_page(sg_page(&host->req->sg), | 204 | pg = nth_page(sg_page(&host->req->sg), |
| 203 | off >> PAGE_SHIFT); | 205 | off >> PAGE_SHIFT); |
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 63fb1ff3ad10..f6f2d960cadb 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c | |||
| @@ -28,14 +28,14 @@ | |||
| 28 | static inline void asic3_write_register(struct asic3 *asic, | 28 | static inline void asic3_write_register(struct asic3 *asic, |
| 29 | unsigned int reg, u32 value) | 29 | unsigned int reg, u32 value) |
| 30 | { | 30 | { |
| 31 | iowrite16(value, (unsigned long)asic->mapping + | 31 | iowrite16(value, asic->mapping + |
| 32 | (reg >> asic->bus_shift)); | 32 | (reg >> asic->bus_shift)); |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | static inline u32 asic3_read_register(struct asic3 *asic, | 35 | static inline u32 asic3_read_register(struct asic3 *asic, |
| 36 | unsigned int reg) | 36 | unsigned int reg) |
| 37 | { | 37 | { |
| 38 | return ioread16((unsigned long)asic->mapping + | 38 | return ioread16(asic->mapping + |
| 39 | (reg >> asic->bus_shift)); | 39 | (reg >> asic->bus_shift)); |
| 40 | } | 40 | } |
| 41 | 41 | ||
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c index 1cfd7f3f1294..e2e7c05a147b 100644 --- a/drivers/misc/fujitsu-laptop.c +++ b/drivers/misc/fujitsu-laptop.c | |||
| @@ -231,7 +231,7 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type) | |||
| 231 | 231 | ||
| 232 | if (!device || !acpi_driver_data(device)) | 232 | if (!device || !acpi_driver_data(device)) |
| 233 | return -EINVAL; | 233 | return -EINVAL; |
| 234 | fujitsu->acpi_handle = 0; | 234 | fujitsu->acpi_handle = NULL; |
| 235 | 235 | ||
| 236 | return 0; | 236 | return 0; |
| 237 | } | 237 | } |
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index 4f9d4a9da983..b5f6add34b0b 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c | |||
| @@ -106,7 +106,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi | |||
| 106 | sp->irq = pdev->irq; | 106 | sp->irq = pdev->irq; |
| 107 | sp->base_address = ioremap(pci_resource_start(pdev, 0), | 107 | sp->base_address = ioremap(pci_resource_start(pdev, 0), |
| 108 | pci_resource_len(pdev, 0)); | 108 | pci_resource_len(pdev, 0)); |
| 109 | if (sp->base_address == 0) { | 109 | if (!sp->base_address) { |
| 110 | dev_err(sp->dev, "Failed to ioremap pci memory\n"); | 110 | dev_err(sp->dev, "Failed to ioremap pci memory\n"); |
| 111 | result = -ENODEV; | 111 | result = -ENODEV; |
| 112 | goto error_ioremap; | 112 | goto error_ioremap; |
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c index c884730c5eaf..1bfe5d16963b 100644 --- a/drivers/misc/lkdtm.c +++ b/drivers/misc/lkdtm.c | |||
| @@ -197,7 +197,7 @@ static int lkdtm_parse_commandline(void) | |||
| 197 | { | 197 | { |
| 198 | int i; | 198 | int i; |
| 199 | 199 | ||
| 200 | if (cpoint_name == INVALID || cpoint_type == NONE || | 200 | if (cpoint_name == NULL || cpoint_type == NULL || |
| 201 | cpoint_count < 1 || recur_count < 1) | 201 | cpoint_count < 1 || recur_count < 1) |
| 202 | return -EINVAL; | 202 | return -EINVAL; |
| 203 | 203 | ||
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index f00e04efbe28..bc4649a17b9d 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
| @@ -202,9 +202,8 @@ static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state | |||
| 202 | int ret = 0; | 202 | int ret = 0; |
| 203 | int i; | 203 | int i; |
| 204 | 204 | ||
| 205 | if (info) | 205 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) |
| 206 | for (i = 0; i < MAX_RESOURCES; i++) | 206 | ret |= info->mtd[i]->suspend(info->mtd[i]); |
| 207 | ret |= info->mtd[i]->suspend(info->mtd[i]); | ||
| 208 | 207 | ||
| 209 | return ret; | 208 | return ret; |
| 210 | } | 209 | } |
| @@ -214,9 +213,9 @@ static int physmap_flash_resume(struct platform_device *dev) | |||
| 214 | struct physmap_flash_info *info = platform_get_drvdata(dev); | 213 | struct physmap_flash_info *info = platform_get_drvdata(dev); |
| 215 | int i; | 214 | int i; |
| 216 | 215 | ||
| 217 | if (info) | 216 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) |
| 218 | for (i = 0; i < MAX_RESOURCES; i++) | 217 | info->mtd[i]->resume(info->mtd[i]); |
| 219 | info->mtd[i]->resume(info->mtd[i]); | 218 | |
| 220 | return 0; | 219 | return 0; |
| 221 | } | 220 | } |
| 222 | 221 | ||
| @@ -225,8 +224,8 @@ static void physmap_flash_shutdown(struct platform_device *dev) | |||
| 225 | struct physmap_flash_info *info = platform_get_drvdata(dev); | 224 | struct physmap_flash_info *info = platform_get_drvdata(dev); |
| 226 | int i; | 225 | int i; |
| 227 | 226 | ||
| 228 | for (i = 0; i < MAX_RESOURCES; i++) | 227 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) |
| 229 | if (info && info->mtd[i]->suspend(info->mtd[i]) == 0) | 228 | if (info->mtd[i]->suspend(info->mtd[i]) == 0) |
| 230 | info->mtd[i]->resume(info->mtd[i]); | 229 | info->mtd[i]->resume(info->mtd[i]); |
| 231 | } | 230 | } |
| 232 | #else | 231 | #else |
diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c index 9189ec8f243e..0f6ac250f434 100644 --- a/drivers/mtd/nand/rtc_from4.c +++ b/drivers/mtd/nand/rtc_from4.c | |||
| @@ -460,7 +460,7 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this, | |||
| 460 | er_stat |= 1 << 1; | 460 | er_stat |= 1 << 1; |
| 461 | kfree(buf); | 461 | kfree(buf); |
| 462 | } | 462 | } |
| 463 | 463 | out: | |
| 464 | rtn = status; | 464 | rtn = status; |
| 465 | if (er_stat == 0) { /* if ECC is available */ | 465 | if (er_stat == 0) { /* if ECC is available */ |
| 466 | rtn = (status & ~NAND_STATUS_FAIL); /* clear the error bit */ | 466 | rtn = (status & ~NAND_STATUS_FAIL); /* clear the error bit */ |
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index ea2a2b548e3c..25f1337cd02c 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
| @@ -2082,6 +2082,11 @@ static int __devinit b44_get_invariants(struct b44 *bp) | |||
| 2082 | addr = sdev->bus->sprom.et0mac; | 2082 | addr = sdev->bus->sprom.et0mac; |
| 2083 | bp->phy_addr = sdev->bus->sprom.et0phyaddr; | 2083 | bp->phy_addr = sdev->bus->sprom.et0phyaddr; |
| 2084 | } | 2084 | } |
| 2085 | /* Some ROMs have buggy PHY addresses with the high | ||
| 2086 | * bits set (sign extension?). Truncate them to a | ||
| 2087 | * valid PHY address. */ | ||
| 2088 | bp->phy_addr &= 0x1F; | ||
| 2089 | |||
| 2085 | memcpy(bp->dev->dev_addr, addr, 6); | 2090 | memcpy(bp->dev->dev_addr, addr, 6); |
| 2086 | 2091 | ||
| 2087 | if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){ | 2092 | if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){ |
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index cb3c6faa7888..d16e0e1d2b30 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
| @@ -310,7 +310,7 @@ static inline int __check_agg_selection_timer(struct port *port) | |||
| 310 | */ | 310 | */ |
| 311 | static inline void __get_rx_machine_lock(struct port *port) | 311 | static inline void __get_rx_machine_lock(struct port *port) |
| 312 | { | 312 | { |
| 313 | spin_lock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); | 313 | spin_lock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); |
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | /** | 316 | /** |
| @@ -320,7 +320,7 @@ static inline void __get_rx_machine_lock(struct port *port) | |||
| 320 | */ | 320 | */ |
| 321 | static inline void __release_rx_machine_lock(struct port *port) | 321 | static inline void __release_rx_machine_lock(struct port *port) |
| 322 | { | 322 | { |
| 323 | spin_unlock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); | 323 | spin_unlock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); |
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | /** | 326 | /** |
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index b57bc9467dbe..3f58c3d0b710 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
| @@ -678,12 +678,8 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon | |||
| 678 | } | 678 | } |
| 679 | 679 | ||
| 680 | if (!list_empty(&bond->vlan_list)) { | 680 | if (!list_empty(&bond->vlan_list)) { |
| 681 | unsigned short vlan_id; | 681 | if (!vlan_get_tag(skb, &client_info->vlan_id)) |
| 682 | int res = vlan_get_tag(skb, &vlan_id); | ||
| 683 | if (!res) { | ||
| 684 | client_info->tag = 1; | 682 | client_info->tag = 1; |
| 685 | client_info->vlan_id = vlan_id; | ||
| 686 | } | ||
| 687 | } | 683 | } |
| 688 | 684 | ||
| 689 | if (!client_info->assigned) { | 685 | if (!client_info->assigned) { |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 0942d82f7cbf..0f0675319e9c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -383,7 +383,7 @@ struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr) | |||
| 383 | */ | 383 | */ |
| 384 | int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev) | 384 | int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev) |
| 385 | { | 385 | { |
| 386 | unsigned short vlan_id; | 386 | unsigned short uninitialized_var(vlan_id); |
| 387 | 387 | ||
| 388 | if (!list_empty(&bond->vlan_list) && | 388 | if (!list_empty(&bond->vlan_list) && |
| 389 | !(slave_dev->features & NETIF_F_HW_VLAN_TX) && | 389 | !(slave_dev->features & NETIF_F_HW_VLAN_TX) && |
| @@ -4528,8 +4528,7 @@ static void bond_free_all(void) | |||
| 4528 | netif_tx_unlock_bh(bond_dev); | 4528 | netif_tx_unlock_bh(bond_dev); |
| 4529 | /* Release the bonded slaves */ | 4529 | /* Release the bonded slaves */ |
| 4530 | bond_release_all(bond_dev); | 4530 | bond_release_all(bond_dev); |
| 4531 | bond_deinit(bond_dev); | 4531 | bond_destroy(bond); |
| 4532 | unregister_netdevice(bond_dev); | ||
| 4533 | } | 4532 | } |
| 4534 | 4533 | ||
| 4535 | #ifdef CONFIG_PROC_FS | 4534 | #ifdef CONFIG_PROC_FS |
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 67ccad69d445..a3c74e20aa53 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
| @@ -22,8 +22,8 @@ | |||
| 22 | #include "bond_3ad.h" | 22 | #include "bond_3ad.h" |
| 23 | #include "bond_alb.h" | 23 | #include "bond_alb.h" |
| 24 | 24 | ||
| 25 | #define DRV_VERSION "3.2.4" | 25 | #define DRV_VERSION "3.2.5" |
| 26 | #define DRV_RELDATE "January 28, 2008" | 26 | #define DRV_RELDATE "March 21, 2008" |
| 27 | #define DRV_NAME "bonding" | 27 | #define DRV_NAME "bonding" |
| 28 | #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" | 28 | #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" |
| 29 | 29 | ||
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index db586870c5f4..98a6bbd11d4c 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c | |||
| @@ -557,9 +557,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q) | |||
| 557 | 557 | ||
| 558 | for (i = 0; i < SGE_RXQ_PER_SET; ++i) | 558 | for (i = 0; i < SGE_RXQ_PER_SET; ++i) |
| 559 | if (q->fl[i].desc) { | 559 | if (q->fl[i].desc) { |
| 560 | spin_lock(&adapter->sge.reg_lock); | 560 | spin_lock_irq(&adapter->sge.reg_lock); |
| 561 | t3_sge_disable_fl(adapter, q->fl[i].cntxt_id); | 561 | t3_sge_disable_fl(adapter, q->fl[i].cntxt_id); |
| 562 | spin_unlock(&adapter->sge.reg_lock); | 562 | spin_unlock_irq(&adapter->sge.reg_lock); |
| 563 | free_rx_bufs(pdev, &q->fl[i]); | 563 | free_rx_bufs(pdev, &q->fl[i]); |
| 564 | kfree(q->fl[i].sdesc); | 564 | kfree(q->fl[i].sdesc); |
| 565 | dma_free_coherent(&pdev->dev, | 565 | dma_free_coherent(&pdev->dev, |
| @@ -570,9 +570,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q) | |||
| 570 | 570 | ||
| 571 | for (i = 0; i < SGE_TXQ_PER_SET; ++i) | 571 | for (i = 0; i < SGE_TXQ_PER_SET; ++i) |
| 572 | if (q->txq[i].desc) { | 572 | if (q->txq[i].desc) { |
| 573 | spin_lock(&adapter->sge.reg_lock); | 573 | spin_lock_irq(&adapter->sge.reg_lock); |
| 574 | t3_sge_enable_ecntxt(adapter, q->txq[i].cntxt_id, 0); | 574 | t3_sge_enable_ecntxt(adapter, q->txq[i].cntxt_id, 0); |
| 575 | spin_unlock(&adapter->sge.reg_lock); | 575 | spin_unlock_irq(&adapter->sge.reg_lock); |
| 576 | if (q->txq[i].sdesc) { | 576 | if (q->txq[i].sdesc) { |
| 577 | free_tx_desc(adapter, &q->txq[i], | 577 | free_tx_desc(adapter, &q->txq[i], |
| 578 | q->txq[i].in_use); | 578 | q->txq[i].in_use); |
| @@ -586,9 +586,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q) | |||
| 586 | } | 586 | } |
| 587 | 587 | ||
| 588 | if (q->rspq.desc) { | 588 | if (q->rspq.desc) { |
| 589 | spin_lock(&adapter->sge.reg_lock); | 589 | spin_lock_irq(&adapter->sge.reg_lock); |
| 590 | t3_sge_disable_rspcntxt(adapter, q->rspq.cntxt_id); | 590 | t3_sge_disable_rspcntxt(adapter, q->rspq.cntxt_id); |
| 591 | spin_unlock(&adapter->sge.reg_lock); | 591 | spin_unlock_irq(&adapter->sge.reg_lock); |
| 592 | dma_free_coherent(&pdev->dev, | 592 | dma_free_coherent(&pdev->dev, |
| 593 | q->rspq.size * sizeof(struct rsp_desc), | 593 | q->rspq.size * sizeof(struct rsp_desc), |
| 594 | q->rspq.desc, q->rspq.phys_addr); | 594 | q->rspq.desc, q->rspq.phys_addr); |
| @@ -2667,7 +2667,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports, | |||
| 2667 | (16 * 1024) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) : | 2667 | (16 * 1024) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) : |
| 2668 | MAX_FRAME_SIZE + 2 + sizeof(struct cpl_rx_pkt); | 2668 | MAX_FRAME_SIZE + 2 + sizeof(struct cpl_rx_pkt); |
| 2669 | 2669 | ||
| 2670 | spin_lock(&adapter->sge.reg_lock); | 2670 | spin_lock_irq(&adapter->sge.reg_lock); |
| 2671 | 2671 | ||
| 2672 | /* FL threshold comparison uses < */ | 2672 | /* FL threshold comparison uses < */ |
| 2673 | ret = t3_sge_init_rspcntxt(adapter, q->rspq.cntxt_id, irq_vec_idx, | 2673 | ret = t3_sge_init_rspcntxt(adapter, q->rspq.cntxt_id, irq_vec_idx, |
| @@ -2711,7 +2711,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports, | |||
| 2711 | goto err_unlock; | 2711 | goto err_unlock; |
| 2712 | } | 2712 | } |
| 2713 | 2713 | ||
| 2714 | spin_unlock(&adapter->sge.reg_lock); | 2714 | spin_unlock_irq(&adapter->sge.reg_lock); |
| 2715 | 2715 | ||
| 2716 | q->adap = adapter; | 2716 | q->adap = adapter; |
| 2717 | q->netdev = dev; | 2717 | q->netdev = dev; |
| @@ -2728,7 +2728,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports, | |||
| 2728 | return 0; | 2728 | return 0; |
| 2729 | 2729 | ||
| 2730 | err_unlock: | 2730 | err_unlock: |
| 2731 | spin_unlock(&adapter->sge.reg_lock); | 2731 | spin_unlock_irq(&adapter->sge.reg_lock); |
| 2732 | err: | 2732 | err: |
| 2733 | t3_free_qset(adapter, q); | 2733 | t3_free_qset(adapter, q); |
| 2734 | return ret; | 2734 | return ret; |
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 1fe305ca2cf0..d63cc93f055d 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
| @@ -798,8 +798,6 @@ dm9000_init_dm9000(struct net_device *dev) | |||
| 798 | /* Set address filter table */ | 798 | /* Set address filter table */ |
| 799 | dm9000_hash_table(dev); | 799 | dm9000_hash_table(dev); |
| 800 | 800 | ||
| 801 | /* Activate DM9000 */ | ||
| 802 | iow(db, DM9000_RCR, RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN); | ||
| 803 | /* Enable TX/RX interrupt mask */ | 801 | /* Enable TX/RX interrupt mask */ |
| 804 | iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM); | 802 | iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM); |
| 805 | 803 | ||
| @@ -970,7 +968,7 @@ dm9000_interrupt(int irq, void *dev_id) | |||
| 970 | struct dm9000_rxhdr { | 968 | struct dm9000_rxhdr { |
| 971 | u8 RxPktReady; | 969 | u8 RxPktReady; |
| 972 | u8 RxStatus; | 970 | u8 RxStatus; |
| 973 | u16 RxLen; | 971 | __le16 RxLen; |
| 974 | } __attribute__((__packed__)); | 972 | } __attribute__((__packed__)); |
| 975 | 973 | ||
| 976 | /* | 974 | /* |
| @@ -1197,6 +1195,7 @@ dm9000_hash_table(struct net_device *dev) | |||
| 1197 | int i, oft; | 1195 | int i, oft; |
| 1198 | u32 hash_val; | 1196 | u32 hash_val; |
| 1199 | u16 hash_table[4]; | 1197 | u16 hash_table[4]; |
| 1198 | u8 rcr = RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN; | ||
| 1200 | unsigned long flags; | 1199 | unsigned long flags; |
| 1201 | 1200 | ||
| 1202 | dm9000_dbg(db, 1, "entering %s\n", __func__); | 1201 | dm9000_dbg(db, 1, "entering %s\n", __func__); |
| @@ -1213,6 +1212,12 @@ dm9000_hash_table(struct net_device *dev) | |||
| 1213 | /* broadcast address */ | 1212 | /* broadcast address */ |
| 1214 | hash_table[3] = 0x8000; | 1213 | hash_table[3] = 0x8000; |
| 1215 | 1214 | ||
| 1215 | if (dev->flags & IFF_PROMISC) | ||
| 1216 | rcr |= RCR_PRMSC; | ||
| 1217 | |||
| 1218 | if (dev->flags & IFF_ALLMULTI) | ||
| 1219 | rcr |= RCR_ALL; | ||
| 1220 | |||
| 1216 | /* the multicast address in Hash Table : 64 bits */ | 1221 | /* the multicast address in Hash Table : 64 bits */ |
| 1217 | for (i = 0; i < mc_cnt; i++, mcptr = mcptr->next) { | 1222 | for (i = 0; i < mc_cnt; i++, mcptr = mcptr->next) { |
| 1218 | hash_val = ether_crc_le(6, mcptr->dmi_addr) & 0x3f; | 1223 | hash_val = ether_crc_le(6, mcptr->dmi_addr) & 0x3f; |
| @@ -1225,6 +1230,7 @@ dm9000_hash_table(struct net_device *dev) | |||
| 1225 | iow(db, oft++, hash_table[i] >> 8); | 1230 | iow(db, oft++, hash_table[i] >> 8); |
| 1226 | } | 1231 | } |
| 1227 | 1232 | ||
| 1233 | iow(db, DM9000_RCR, rcr); | ||
| 1228 | spin_unlock_irqrestore(&db->lock, flags); | 1234 | spin_unlock_irqrestore(&db->lock, flags); |
| 1229 | } | 1235 | } |
| 1230 | 1236 | ||
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index cdf3090a1885..2d139ec79777 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -960,7 +960,7 @@ static void e100_get_defaults(struct nic *nic) | |||
| 960 | 960 | ||
| 961 | /* Template for a freshly allocated RFD */ | 961 | /* Template for a freshly allocated RFD */ |
| 962 | nic->blank_rfd.command = 0; | 962 | nic->blank_rfd.command = 0; |
| 963 | nic->blank_rfd.rbd = 0xFFFFFFFF; | 963 | nic->blank_rfd.rbd = cpu_to_le32(0xFFFFFFFF); |
| 964 | nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN); | 964 | nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN); |
| 965 | 965 | ||
| 966 | /* MII setup */ | 966 | /* MII setup */ |
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index 7c4ead35cfa2..93b7fb246960 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 41 | 41 | ||
| 42 | #define DRV_NAME "ehea" | 42 | #define DRV_NAME "ehea" |
| 43 | #define DRV_VERSION "EHEA_0087" | 43 | #define DRV_VERSION "EHEA_0089" |
| 44 | 44 | ||
| 45 | /* eHEA capability flags */ | 45 | /* eHEA capability flags */ |
| 46 | #define DLPAR_PORT_ADD_REM 1 | 46 | #define DLPAR_PORT_ADD_REM 1 |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 21af674b764e..07c742dd3f09 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
| @@ -3108,7 +3108,7 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, | |||
| 3108 | dev->vlan_rx_add_vid = ehea_vlan_rx_add_vid; | 3108 | dev->vlan_rx_add_vid = ehea_vlan_rx_add_vid; |
| 3109 | dev->vlan_rx_kill_vid = ehea_vlan_rx_kill_vid; | 3109 | dev->vlan_rx_kill_vid = ehea_vlan_rx_kill_vid; |
| 3110 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | 3110 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO |
| 3111 | | NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_TX | 3111 | | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX |
| 3112 | | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER | 3112 | | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER |
| 3113 | | NETIF_F_LLTX; | 3113 | | NETIF_F_LLTX; |
| 3114 | dev->tx_timeout = &ehea_tx_watchdog; | 3114 | dev->tx_timeout = &ehea_tx_watchdog; |
diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/igb/e1000_82575.h index 6604d96bd567..76ea846663db 100644 --- a/drivers/net/igb/e1000_82575.h +++ b/drivers/net/igb/e1000_82575.h | |||
| @@ -61,28 +61,28 @@ | |||
| 61 | /* Receive Descriptor - Advanced */ | 61 | /* Receive Descriptor - Advanced */ |
| 62 | union e1000_adv_rx_desc { | 62 | union e1000_adv_rx_desc { |
| 63 | struct { | 63 | struct { |
| 64 | u64 pkt_addr; /* Packet buffer address */ | 64 | __le64 pkt_addr; /* Packet buffer address */ |
| 65 | u64 hdr_addr; /* Header buffer address */ | 65 | __le64 hdr_addr; /* Header buffer address */ |
| 66 | } read; | 66 | } read; |
| 67 | struct { | 67 | struct { |
| 68 | struct { | 68 | struct { |
| 69 | struct { | 69 | struct { |
| 70 | u16 pkt_info; /* RSS type, Packet type */ | 70 | __le16 pkt_info; /* RSS type, Packet type */ |
| 71 | u16 hdr_info; /* Split Header, | 71 | __le16 hdr_info; /* Split Header, |
| 72 | * header buffer length */ | 72 | * header buffer length */ |
| 73 | } lo_dword; | 73 | } lo_dword; |
| 74 | union { | 74 | union { |
| 75 | u32 rss; /* RSS Hash */ | 75 | __le32 rss; /* RSS Hash */ |
| 76 | struct { | 76 | struct { |
| 77 | u16 ip_id; /* IP id */ | 77 | __le16 ip_id; /* IP id */ |
| 78 | u16 csum; /* Packet Checksum */ | 78 | __le16 csum; /* Packet Checksum */ |
| 79 | } csum_ip; | 79 | } csum_ip; |
| 80 | } hi_dword; | 80 | } hi_dword; |
| 81 | } lower; | 81 | } lower; |
| 82 | struct { | 82 | struct { |
| 83 | u32 status_error; /* ext status/error */ | 83 | __le32 status_error; /* ext status/error */ |
| 84 | u16 length; /* Packet length */ | 84 | __le16 length; /* Packet length */ |
| 85 | u16 vlan; /* VLAN tag */ | 85 | __le16 vlan; /* VLAN tag */ |
| 86 | } upper; | 86 | } upper; |
| 87 | } wb; /* writeback */ | 87 | } wb; /* writeback */ |
| 88 | }; | 88 | }; |
| @@ -97,14 +97,14 @@ union e1000_adv_rx_desc { | |||
| 97 | /* Transmit Descriptor - Advanced */ | 97 | /* Transmit Descriptor - Advanced */ |
| 98 | union e1000_adv_tx_desc { | 98 | union e1000_adv_tx_desc { |
| 99 | struct { | 99 | struct { |
| 100 | u64 buffer_addr; /* Address of descriptor's data buf */ | 100 | __le64 buffer_addr; /* Address of descriptor's data buf */ |
| 101 | u32 cmd_type_len; | 101 | __le32 cmd_type_len; |
| 102 | u32 olinfo_status; | 102 | __le32 olinfo_status; |
| 103 | } read; | 103 | } read; |
| 104 | struct { | 104 | struct { |
| 105 | u64 rsvd; /* Reserved */ | 105 | __le64 rsvd; /* Reserved */ |
| 106 | u32 nxtseq_seed; | 106 | __le32 nxtseq_seed; |
| 107 | u32 status; | 107 | __le32 status; |
| 108 | } wb; | 108 | } wb; |
| 109 | }; | 109 | }; |
| 110 | 110 | ||
| @@ -119,10 +119,10 @@ union e1000_adv_tx_desc { | |||
| 119 | 119 | ||
| 120 | /* Context descriptors */ | 120 | /* Context descriptors */ |
| 121 | struct e1000_adv_tx_context_desc { | 121 | struct e1000_adv_tx_context_desc { |
| 122 | u32 vlan_macip_lens; | 122 | __le32 vlan_macip_lens; |
| 123 | u32 seqnum_seed; | 123 | __le32 seqnum_seed; |
| 124 | u32 type_tucmd_mlhl; | 124 | __le32 type_tucmd_mlhl; |
| 125 | u32 mss_l4len_idx; | 125 | __le32 mss_l4len_idx; |
| 126 | }; | 126 | }; |
| 127 | 127 | ||
| 128 | #define E1000_ADVTXD_MACLEN_SHIFT 9 /* Adv ctxt desc mac len shift */ | 128 | #define E1000_ADVTXD_MACLEN_SHIFT 9 /* Adv ctxt desc mac len shift */ |
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index 161fb68764af..7b2c70a3b8cc 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h | |||
| @@ -143,35 +143,35 @@ enum e1000_fc_type { | |||
| 143 | 143 | ||
| 144 | /* Receive Descriptor */ | 144 | /* Receive Descriptor */ |
| 145 | struct e1000_rx_desc { | 145 | struct e1000_rx_desc { |
| 146 | u64 buffer_addr; /* Address of the descriptor's data buffer */ | 146 | __le64 buffer_addr; /* Address of the descriptor's data buffer */ |
| 147 | u16 length; /* Length of data DMAed into data buffer */ | 147 | __le16 length; /* Length of data DMAed into data buffer */ |
| 148 | u16 csum; /* Packet checksum */ | 148 | __le16 csum; /* Packet checksum */ |
| 149 | u8 status; /* Descriptor status */ | 149 | u8 status; /* Descriptor status */ |
| 150 | u8 errors; /* Descriptor Errors */ | 150 | u8 errors; /* Descriptor Errors */ |
| 151 | u16 special; | 151 | __le16 special; |
| 152 | }; | 152 | }; |
| 153 | 153 | ||
| 154 | /* Receive Descriptor - Extended */ | 154 | /* Receive Descriptor - Extended */ |
| 155 | union e1000_rx_desc_extended { | 155 | union e1000_rx_desc_extended { |
| 156 | struct { | 156 | struct { |
| 157 | u64 buffer_addr; | 157 | __le64 buffer_addr; |
| 158 | u64 reserved; | 158 | __le64 reserved; |
| 159 | } read; | 159 | } read; |
| 160 | struct { | 160 | struct { |
| 161 | struct { | 161 | struct { |
| 162 | u32 mrq; /* Multiple Rx Queues */ | 162 | __le32 mrq; /* Multiple Rx Queues */ |
| 163 | union { | 163 | union { |
| 164 | u32 rss; /* RSS Hash */ | 164 | __le32 rss; /* RSS Hash */ |
| 165 | struct { | 165 | struct { |
| 166 | u16 ip_id; /* IP id */ | 166 | __le16 ip_id; /* IP id */ |
| 167 | u16 csum; /* Packet Checksum */ | 167 | __le16 csum; /* Packet Checksum */ |
| 168 | } csum_ip; | 168 | } csum_ip; |
| 169 | } hi_dword; | 169 | } hi_dword; |
| 170 | } lower; | 170 | } lower; |
| 171 | struct { | 171 | struct { |
| 172 | u32 status_error; /* ext status/error */ | 172 | __le32 status_error; /* ext status/error */ |
| 173 | u16 length; | 173 | __le16 length; |
| 174 | u16 vlan; /* VLAN tag */ | 174 | __le16 vlan; /* VLAN tag */ |
| 175 | } upper; | 175 | } upper; |
| 176 | } wb; /* writeback */ | 176 | } wb; /* writeback */ |
| 177 | }; | 177 | }; |
| @@ -181,49 +181,49 @@ union e1000_rx_desc_extended { | |||
| 181 | union e1000_rx_desc_packet_split { | 181 | union e1000_rx_desc_packet_split { |
| 182 | struct { | 182 | struct { |
| 183 | /* one buffer for protocol header(s), three data buffers */ | 183 | /* one buffer for protocol header(s), three data buffers */ |
| 184 | u64 buffer_addr[MAX_PS_BUFFERS]; | 184 | __le64 buffer_addr[MAX_PS_BUFFERS]; |
| 185 | } read; | 185 | } read; |
| 186 | struct { | 186 | struct { |
| 187 | struct { | 187 | struct { |
| 188 | u32 mrq; /* Multiple Rx Queues */ | 188 | __le32 mrq; /* Multiple Rx Queues */ |
| 189 | union { | 189 | union { |
| 190 | u32 rss; /* RSS Hash */ | 190 | __le32 rss; /* RSS Hash */ |
| 191 | struct { | 191 | struct { |
| 192 | u16 ip_id; /* IP id */ | 192 | __le16 ip_id; /* IP id */ |
| 193 | u16 csum; /* Packet Checksum */ | 193 | __le16 csum; /* Packet Checksum */ |
| 194 | } csum_ip; | 194 | } csum_ip; |
| 195 | } hi_dword; | 195 | } hi_dword; |
| 196 | } lower; | 196 | } lower; |
| 197 | struct { | 197 | struct { |
| 198 | u32 status_error; /* ext status/error */ | 198 | __le32 status_error; /* ext status/error */ |
| 199 | u16 length0; /* length of buffer 0 */ | 199 | __le16 length0; /* length of buffer 0 */ |
| 200 | u16 vlan; /* VLAN tag */ | 200 | __le16 vlan; /* VLAN tag */ |
| 201 | } middle; | 201 | } middle; |
| 202 | struct { | 202 | struct { |
| 203 | u16 header_status; | 203 | __le16 header_status; |
| 204 | u16 length[3]; /* length of buffers 1-3 */ | 204 | __le16 length[3]; /* length of buffers 1-3 */ |
| 205 | } upper; | 205 | } upper; |
| 206 | u64 reserved; | 206 | __le64 reserved; |
| 207 | } wb; /* writeback */ | 207 | } wb; /* writeback */ |
| 208 | }; | 208 | }; |
| 209 | 209 | ||
| 210 | /* Transmit Descriptor */ | 210 | /* Transmit Descriptor */ |
| 211 | struct e1000_tx_desc { | 211 | struct e1000_tx_desc { |
| 212 | u64 buffer_addr; /* Address of the descriptor's data buffer */ | 212 | __le64 buffer_addr; /* Address of the descriptor's data buffer */ |
| 213 | union { | 213 | union { |
| 214 | u32 data; | 214 | __le32 data; |
| 215 | struct { | 215 | struct { |
| 216 | u16 length; /* Data buffer length */ | 216 | __le16 length; /* Data buffer length */ |
| 217 | u8 cso; /* Checksum offset */ | 217 | u8 cso; /* Checksum offset */ |
| 218 | u8 cmd; /* Descriptor control */ | 218 | u8 cmd; /* Descriptor control */ |
| 219 | } flags; | 219 | } flags; |
| 220 | } lower; | 220 | } lower; |
| 221 | union { | 221 | union { |
| 222 | u32 data; | 222 | __le32 data; |
| 223 | struct { | 223 | struct { |
| 224 | u8 status; /* Descriptor status */ | 224 | u8 status; /* Descriptor status */ |
| 225 | u8 css; /* Checksum start */ | 225 | u8 css; /* Checksum start */ |
| 226 | u16 special; | 226 | __le16 special; |
| 227 | } fields; | 227 | } fields; |
| 228 | } upper; | 228 | } upper; |
| 229 | }; | 229 | }; |
| @@ -231,49 +231,49 @@ struct e1000_tx_desc { | |||
| 231 | /* Offload Context Descriptor */ | 231 | /* Offload Context Descriptor */ |
| 232 | struct e1000_context_desc { | 232 | struct e1000_context_desc { |
| 233 | union { | 233 | union { |
| 234 | u32 ip_config; | 234 | __le32 ip_config; |
| 235 | struct { | 235 | struct { |
| 236 | u8 ipcss; /* IP checksum start */ | 236 | u8 ipcss; /* IP checksum start */ |
| 237 | u8 ipcso; /* IP checksum offset */ | 237 | u8 ipcso; /* IP checksum offset */ |
| 238 | u16 ipcse; /* IP checksum end */ | 238 | __le16 ipcse; /* IP checksum end */ |
| 239 | } ip_fields; | 239 | } ip_fields; |
| 240 | } lower_setup; | 240 | } lower_setup; |
| 241 | union { | 241 | union { |
| 242 | u32 tcp_config; | 242 | __le32 tcp_config; |
| 243 | struct { | 243 | struct { |
| 244 | u8 tucss; /* TCP checksum start */ | 244 | u8 tucss; /* TCP checksum start */ |
| 245 | u8 tucso; /* TCP checksum offset */ | 245 | u8 tucso; /* TCP checksum offset */ |
| 246 | u16 tucse; /* TCP checksum end */ | 246 | __le16 tucse; /* TCP checksum end */ |
| 247 | } tcp_fields; | 247 | } tcp_fields; |
| 248 | } upper_setup; | 248 | } upper_setup; |
| 249 | u32 cmd_and_length; | 249 | __le32 cmd_and_length; |
| 250 | union { | 250 | union { |
| 251 | u32 data; | 251 | __le32 data; |
| 252 | struct { | 252 | struct { |
| 253 | u8 status; /* Descriptor status */ | 253 | u8 status; /* Descriptor status */ |
| 254 | u8 hdr_len; /* Header length */ | 254 | u8 hdr_len; /* Header length */ |
| 255 | u16 mss; /* Maximum segment size */ | 255 | __le16 mss; /* Maximum segment size */ |
| 256 | } fields; | 256 | } fields; |
| 257 | } tcp_seg_setup; | 257 | } tcp_seg_setup; |
| 258 | }; | 258 | }; |
| 259 | 259 | ||
| 260 | /* Offload data descriptor */ | 260 | /* Offload data descriptor */ |
| 261 | struct e1000_data_desc { | 261 | struct e1000_data_desc { |
| 262 | u64 buffer_addr; /* Address of the descriptor's buffer address */ | 262 | __le64 buffer_addr; /* Address of the descriptor's buffer address */ |
| 263 | union { | 263 | union { |
| 264 | u32 data; | 264 | __le32 data; |
| 265 | struct { | 265 | struct { |
| 266 | u16 length; /* Data buffer length */ | 266 | __le16 length; /* Data buffer length */ |
| 267 | u8 typ_len_ext; | 267 | u8 typ_len_ext; |
| 268 | u8 cmd; | 268 | u8 cmd; |
| 269 | } flags; | 269 | } flags; |
| 270 | } lower; | 270 | } lower; |
| 271 | union { | 271 | union { |
| 272 | u32 data; | 272 | __le32 data; |
| 273 | struct { | 273 | struct { |
| 274 | u8 status; /* Descriptor status */ | 274 | u8 status; /* Descriptor status */ |
| 275 | u8 popts; /* Packet Options */ | 275 | u8 popts; /* Packet Options */ |
| 276 | u16 special; | 276 | __le16 special; |
| 277 | } fields; | 277 | } fields; |
| 278 | } upper; | 278 | } upper; |
| 279 | }; | 279 | }; |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 928ce8287e69..aaee02e9e3f0 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -3254,6 +3254,13 @@ quit_polling: | |||
| 3254 | 3254 | ||
| 3255 | return 1; | 3255 | return 1; |
| 3256 | } | 3256 | } |
| 3257 | |||
| 3258 | static inline u32 get_head(struct igb_ring *tx_ring) | ||
| 3259 | { | ||
| 3260 | void *end = (struct e1000_tx_desc *)tx_ring->desc + tx_ring->count; | ||
| 3261 | return le32_to_cpu(*(volatile __le32 *)end); | ||
| 3262 | } | ||
| 3263 | |||
| 3257 | /** | 3264 | /** |
| 3258 | * igb_clean_tx_irq - Reclaim resources after transmit completes | 3265 | * igb_clean_tx_irq - Reclaim resources after transmit completes |
| 3259 | * @adapter: board private structure | 3266 | * @adapter: board private structure |
| @@ -3275,9 +3282,7 @@ static bool igb_clean_tx_irq(struct igb_adapter *adapter, | |||
| 3275 | unsigned int total_bytes = 0, total_packets = 0; | 3282 | unsigned int total_bytes = 0, total_packets = 0; |
| 3276 | 3283 | ||
| 3277 | rmb(); | 3284 | rmb(); |
| 3278 | head = *(volatile u32 *)((struct e1000_tx_desc *)tx_ring->desc | 3285 | head = get_head(tx_ring); |
| 3279 | + tx_ring->count); | ||
| 3280 | head = le32_to_cpu(head); | ||
| 3281 | i = tx_ring->next_to_clean; | 3286 | i = tx_ring->next_to_clean; |
| 3282 | while (1) { | 3287 | while (1) { |
| 3283 | while (i != head) { | 3288 | while (i != head) { |
| @@ -3312,9 +3317,7 @@ static bool igb_clean_tx_irq(struct igb_adapter *adapter, | |||
| 3312 | } | 3317 | } |
| 3313 | oldhead = head; | 3318 | oldhead = head; |
| 3314 | rmb(); | 3319 | rmb(); |
| 3315 | head = *(volatile u32 *)((struct e1000_tx_desc *)tx_ring->desc | 3320 | head = get_head(tx_ring); |
| 3316 | + tx_ring->count); | ||
| 3317 | head = le32_to_cpu(head); | ||
| 3318 | if (head == oldhead) | 3321 | if (head == oldhead) |
| 3319 | goto done_cleaning; | 3322 | goto done_cleaning; |
| 3320 | } /* while (1) */ | 3323 | } /* while (1) */ |
| @@ -3388,7 +3391,7 @@ done_cleaning: | |||
| 3388 | * @vlan: descriptor vlan field as written by hardware (no le/be conversion) | 3391 | * @vlan: descriptor vlan field as written by hardware (no le/be conversion) |
| 3389 | * @skb: pointer to sk_buff to be indicated to stack | 3392 | * @skb: pointer to sk_buff to be indicated to stack |
| 3390 | **/ | 3393 | **/ |
| 3391 | static void igb_receive_skb(struct igb_adapter *adapter, u8 status, u16 vlan, | 3394 | static void igb_receive_skb(struct igb_adapter *adapter, u8 status, __le16 vlan, |
| 3392 | struct sk_buff *skb) | 3395 | struct sk_buff *skb) |
| 3393 | { | 3396 | { |
| 3394 | if (adapter->vlgrp && (status & E1000_RXD_STAT_VP)) | 3397 | if (adapter->vlgrp && (status & E1000_RXD_STAT_VP)) |
| @@ -3452,8 +3455,8 @@ static bool igb_clean_rx_irq_adv(struct igb_adapter *adapter, | |||
| 3452 | * that case, it fills the header buffer and spills the rest | 3455 | * that case, it fills the header buffer and spills the rest |
| 3453 | * into the page. | 3456 | * into the page. |
| 3454 | */ | 3457 | */ |
| 3455 | hlen = le16_to_cpu((rx_desc->wb.lower.lo_dword.hdr_info & | 3458 | hlen = (le16_to_cpu(rx_desc->wb.lower.lo_dword.hdr_info) & |
| 3456 | E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT); | 3459 | E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT; |
| 3457 | if (hlen > adapter->rx_ps_hdr_size) | 3460 | if (hlen > adapter->rx_ps_hdr_size) |
| 3458 | hlen = adapter->rx_ps_hdr_size; | 3461 | hlen = adapter->rx_ps_hdr_size; |
| 3459 | 3462 | ||
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 269e6f805f47..6738b4d097fe 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
| @@ -2088,14 +2088,12 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter) | |||
| 2088 | struct ixgb_buffer *buffer_info; | 2088 | struct ixgb_buffer *buffer_info; |
| 2089 | struct sk_buff *skb; | 2089 | struct sk_buff *skb; |
| 2090 | unsigned int i; | 2090 | unsigned int i; |
| 2091 | int num_group_tail_writes; | ||
| 2092 | long cleancount; | 2091 | long cleancount; |
| 2093 | 2092 | ||
| 2094 | i = rx_ring->next_to_use; | 2093 | i = rx_ring->next_to_use; |
| 2095 | buffer_info = &rx_ring->buffer_info[i]; | 2094 | buffer_info = &rx_ring->buffer_info[i]; |
| 2096 | cleancount = IXGB_DESC_UNUSED(rx_ring); | 2095 | cleancount = IXGB_DESC_UNUSED(rx_ring); |
| 2097 | 2096 | ||
| 2098 | num_group_tail_writes = IXGB_RX_BUFFER_WRITE; | ||
| 2099 | 2097 | ||
| 2100 | /* leave three descriptors unused */ | 2098 | /* leave three descriptors unused */ |
| 2101 | while(--cleancount > 2) { | 2099 | while(--cleancount > 2) { |
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index 2bc5eaae141f..7f20a03623a0 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
| @@ -85,7 +85,7 @@ | |||
| 85 | (sizeof(struct netxen_cmd_buffer) * adapter->max_tx_desc_count) | 85 | (sizeof(struct netxen_cmd_buffer) * adapter->max_tx_desc_count) |
| 86 | #define RCV_BUFFSIZE \ | 86 | #define RCV_BUFFSIZE \ |
| 87 | (sizeof(struct netxen_rx_buffer) * rcv_desc->max_rx_desc_count) | 87 | (sizeof(struct netxen_rx_buffer) * rcv_desc->max_rx_desc_count) |
| 88 | #define find_diff_among(a,b,range) ((a)<=(b)?((b)-(a)):((b)+(range)-(a))) | 88 | #define find_diff_among(a,b,range) ((a)<(b)?((b)-(a)):((b)+(range)-(a))) |
| 89 | 89 | ||
| 90 | #define NETXEN_NETDEV_STATUS 0x1 | 90 | #define NETXEN_NETDEV_STATUS 0x1 |
| 91 | #define NETXEN_RCV_PRODUCER_OFFSET 0 | 91 | #define NETXEN_RCV_PRODUCER_OFFSET 0 |
| @@ -204,7 +204,7 @@ enum { | |||
| 204 | ? RCV_DESC_LRO : \ | 204 | ? RCV_DESC_LRO : \ |
| 205 | (RCV_DESC_NORMAL))) | 205 | (RCV_DESC_NORMAL))) |
| 206 | 206 | ||
| 207 | #define MAX_CMD_DESCRIPTORS 1024 | 207 | #define MAX_CMD_DESCRIPTORS 4096 |
| 208 | #define MAX_RCV_DESCRIPTORS 16384 | 208 | #define MAX_RCV_DESCRIPTORS 16384 |
| 209 | #define MAX_CMD_DESCRIPTORS_HOST (MAX_CMD_DESCRIPTORS / 4) | 209 | #define MAX_CMD_DESCRIPTORS_HOST (MAX_CMD_DESCRIPTORS / 4) |
| 210 | #define MAX_RCV_DESCRIPTORS_1G (MAX_RCV_DESCRIPTORS / 4) | 210 | #define MAX_RCV_DESCRIPTORS_1G (MAX_RCV_DESCRIPTORS / 4) |
| @@ -818,15 +818,8 @@ struct netxen_adapter_stats { | |||
| 818 | u64 badskblen; | 818 | u64 badskblen; |
| 819 | u64 nocmddescriptor; | 819 | u64 nocmddescriptor; |
| 820 | u64 polled; | 820 | u64 polled; |
| 821 | u64 uphappy; | 821 | u64 rxdropped; |
| 822 | u64 updropped; | ||
| 823 | u64 uplcong; | ||
| 824 | u64 uphcong; | ||
| 825 | u64 upmcong; | ||
| 826 | u64 updunno; | ||
| 827 | u64 skbfreed; | ||
| 828 | u64 txdropped; | 822 | u64 txdropped; |
| 829 | u64 txnullskb; | ||
| 830 | u64 csummed; | 823 | u64 csummed; |
| 831 | u64 no_rcv; | 824 | u64 no_rcv; |
| 832 | u64 rxbytes; | 825 | u64 rxbytes; |
| @@ -842,7 +835,6 @@ struct netxen_rcv_desc_ctx { | |||
| 842 | u32 flags; | 835 | u32 flags; |
| 843 | u32 producer; | 836 | u32 producer; |
| 844 | u32 rcv_pending; /* Num of bufs posted in phantom */ | 837 | u32 rcv_pending; /* Num of bufs posted in phantom */ |
| 845 | u32 rcv_free; /* Num of bufs in free list */ | ||
| 846 | dma_addr_t phys_addr; | 838 | dma_addr_t phys_addr; |
| 847 | struct pci_dev *phys_pdev; | 839 | struct pci_dev *phys_pdev; |
| 848 | struct rcv_desc *desc_head; /* address of rx ring in Phantom */ | 840 | struct rcv_desc *desc_head; /* address of rx ring in Phantom */ |
| @@ -889,8 +881,6 @@ struct netxen_adapter { | |||
| 889 | int mtu; | 881 | int mtu; |
| 890 | int portnum; | 882 | int portnum; |
| 891 | 883 | ||
| 892 | spinlock_t tx_lock; | ||
| 893 | spinlock_t lock; | ||
| 894 | struct work_struct watchdog_task; | 884 | struct work_struct watchdog_task; |
| 895 | struct timer_list watchdog_timer; | 885 | struct timer_list watchdog_timer; |
| 896 | struct work_struct tx_timeout_task; | 886 | struct work_struct tx_timeout_task; |
| @@ -899,16 +889,12 @@ struct netxen_adapter { | |||
| 899 | 889 | ||
| 900 | u32 cmd_producer; | 890 | u32 cmd_producer; |
| 901 | __le32 *cmd_consumer; | 891 | __le32 *cmd_consumer; |
| 902 | |||
| 903 | u32 last_cmd_consumer; | 892 | u32 last_cmd_consumer; |
| 893 | |||
| 904 | u32 max_tx_desc_count; | 894 | u32 max_tx_desc_count; |
| 905 | u32 max_rx_desc_count; | 895 | u32 max_rx_desc_count; |
| 906 | u32 max_jumbo_rx_desc_count; | 896 | u32 max_jumbo_rx_desc_count; |
| 907 | u32 max_lro_rx_desc_count; | 897 | u32 max_lro_rx_desc_count; |
| 908 | /* Num of instances active on cmd buffer ring */ | ||
| 909 | u32 proc_cmd_buf_counter; | ||
| 910 | |||
| 911 | u32 num_threads, total_threads; /*Use to keep track of xmit threads */ | ||
| 912 | 898 | ||
| 913 | u32 flags; | 899 | u32 flags; |
| 914 | u32 irq; | 900 | u32 irq; |
| @@ -942,6 +928,7 @@ struct netxen_adapter { | |||
| 942 | struct pci_dev *ctx_desc_pdev; | 928 | struct pci_dev *ctx_desc_pdev; |
| 943 | dma_addr_t ctx_desc_phys_addr; | 929 | dma_addr_t ctx_desc_phys_addr; |
| 944 | int intr_scheme; | 930 | int intr_scheme; |
| 931 | int msi_mode; | ||
| 945 | int (*enable_phy_interrupts) (struct netxen_adapter *); | 932 | int (*enable_phy_interrupts) (struct netxen_adapter *); |
| 946 | int (*disable_phy_interrupts) (struct netxen_adapter *); | 933 | int (*disable_phy_interrupts) (struct netxen_adapter *); |
| 947 | void (*handle_phy_intr) (struct netxen_adapter *); | 934 | void (*handle_phy_intr) (struct netxen_adapter *); |
| @@ -1075,12 +1062,10 @@ void netxen_tso_check(struct netxen_adapter *adapter, | |||
| 1075 | struct cmd_desc_type0 *desc, struct sk_buff *skb); | 1062 | struct cmd_desc_type0 *desc, struct sk_buff *skb); |
| 1076 | int netxen_nic_hw_resources(struct netxen_adapter *adapter); | 1063 | int netxen_nic_hw_resources(struct netxen_adapter *adapter); |
| 1077 | void netxen_nic_clear_stats(struct netxen_adapter *adapter); | 1064 | void netxen_nic_clear_stats(struct netxen_adapter *adapter); |
| 1078 | int netxen_nic_rx_has_work(struct netxen_adapter *adapter); | ||
| 1079 | int netxen_nic_tx_has_work(struct netxen_adapter *adapter); | ||
| 1080 | void netxen_watchdog_task(struct work_struct *work); | 1065 | void netxen_watchdog_task(struct work_struct *work); |
| 1081 | void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, | 1066 | void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, |
| 1082 | u32 ringid); | 1067 | u32 ringid); |
| 1083 | int netxen_process_cmd_ring(unsigned long data); | 1068 | int netxen_process_cmd_ring(struct netxen_adapter *adapter); |
| 1084 | u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max); | 1069 | u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max); |
| 1085 | void netxen_nic_set_multi(struct net_device *netdev); | 1070 | void netxen_nic_set_multi(struct net_device *netdev); |
| 1086 | int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu); | 1071 | int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu); |
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c index 7a876f4b8db2..6e98d830eefb 100644 --- a/drivers/net/netxen/netxen_nic_ethtool.c +++ b/drivers/net/netxen/netxen_nic_ethtool.c | |||
| @@ -64,15 +64,7 @@ static const struct netxen_nic_stats netxen_nic_gstrings_stats[] = { | |||
| 64 | {"bad_skb_len", NETXEN_NIC_STAT(stats.badskblen)}, | 64 | {"bad_skb_len", NETXEN_NIC_STAT(stats.badskblen)}, |
| 65 | {"no_cmd_desc", NETXEN_NIC_STAT(stats.nocmddescriptor)}, | 65 | {"no_cmd_desc", NETXEN_NIC_STAT(stats.nocmddescriptor)}, |
| 66 | {"polled", NETXEN_NIC_STAT(stats.polled)}, | 66 | {"polled", NETXEN_NIC_STAT(stats.polled)}, |
| 67 | {"uphappy", NETXEN_NIC_STAT(stats.uphappy)}, | ||
| 68 | {"updropped", NETXEN_NIC_STAT(stats.updropped)}, | ||
| 69 | {"uplcong", NETXEN_NIC_STAT(stats.uplcong)}, | ||
| 70 | {"uphcong", NETXEN_NIC_STAT(stats.uphcong)}, | ||
| 71 | {"upmcong", NETXEN_NIC_STAT(stats.upmcong)}, | ||
| 72 | {"updunno", NETXEN_NIC_STAT(stats.updunno)}, | ||
| 73 | {"skb_freed", NETXEN_NIC_STAT(stats.skbfreed)}, | ||
| 74 | {"tx_dropped", NETXEN_NIC_STAT(stats.txdropped)}, | 67 | {"tx_dropped", NETXEN_NIC_STAT(stats.txdropped)}, |
| 75 | {"tx_null_skb", NETXEN_NIC_STAT(stats.txnullskb)}, | ||
| 76 | {"csummed", NETXEN_NIC_STAT(stats.csummed)}, | 68 | {"csummed", NETXEN_NIC_STAT(stats.csummed)}, |
| 77 | {"no_rcv", NETXEN_NIC_STAT(stats.no_rcv)}, | 69 | {"no_rcv", NETXEN_NIC_STAT(stats.no_rcv)}, |
| 78 | {"rx_bytes", NETXEN_NIC_STAT(stats.rxbytes)}, | 70 | {"rx_bytes", NETXEN_NIC_STAT(stats.rxbytes)}, |
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h index d72f8f8fcb50..160f605e58db 100644 --- a/drivers/net/netxen/netxen_nic_hdr.h +++ b/drivers/net/netxen/netxen_nic_hdr.h | |||
| @@ -456,6 +456,12 @@ enum { | |||
| 456 | #define ISR_INT_MASK_SLOW (NETXEN_PCIX_PS_REG(PCIX_INT_MASK)) | 456 | #define ISR_INT_MASK_SLOW (NETXEN_PCIX_PS_REG(PCIX_INT_MASK)) |
| 457 | #define ISR_INT_TARGET_STATUS (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS)) | 457 | #define ISR_INT_TARGET_STATUS (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS)) |
| 458 | #define ISR_INT_TARGET_MASK (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK)) | 458 | #define ISR_INT_TARGET_MASK (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK)) |
| 459 | #define ISR_INT_TARGET_STATUS_F1 (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F1)) | ||
| 460 | #define ISR_INT_TARGET_MASK_F1 (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F1)) | ||
| 461 | #define ISR_INT_TARGET_STATUS_F2 (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F2)) | ||
| 462 | #define ISR_INT_TARGET_MASK_F2 (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F2)) | ||
| 463 | #define ISR_INT_TARGET_STATUS_F3 (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F3)) | ||
| 464 | #define ISR_INT_TARGET_MASK_F3 (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F3)) | ||
| 459 | 465 | ||
| 460 | #define NETXEN_PCI_MAPSIZE 128 | 466 | #define NETXEN_PCI_MAPSIZE 128 |
| 461 | #define NETXEN_PCI_DDR_NET (0x00000000UL) | 467 | #define NETXEN_PCI_DDR_NET (0x00000000UL) |
| @@ -662,6 +668,12 @@ enum { | |||
| 662 | 668 | ||
| 663 | #define PCIX_TARGET_STATUS (0x10118) | 669 | #define PCIX_TARGET_STATUS (0x10118) |
| 664 | #define PCIX_TARGET_MASK (0x10128) | 670 | #define PCIX_TARGET_MASK (0x10128) |
| 671 | #define PCIX_TARGET_STATUS_F1 (0x10160) | ||
| 672 | #define PCIX_TARGET_MASK_F1 (0x10170) | ||
| 673 | #define PCIX_TARGET_STATUS_F2 (0x10164) | ||
| 674 | #define PCIX_TARGET_MASK_F2 (0x10174) | ||
| 675 | #define PCIX_TARGET_STATUS_F3 (0x10168) | ||
| 676 | #define PCIX_TARGET_MASK_F3 (0x10178) | ||
| 665 | 677 | ||
| 666 | #define PCIX_MSI_F0 (0x13000) | 678 | #define PCIX_MSI_F0 (0x13000) |
| 667 | #define PCIX_MSI_F1 (0x13004) | 679 | #define PCIX_MSI_F1 (0x13004) |
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 01355701bf8e..05748ca6f216 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
| @@ -398,6 +398,8 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) | |||
| 398 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_FW)); | 398 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_FW)); |
| 399 | printk(KERN_NOTICE "%s: FW capabilities:0x%x\n", netxen_nic_driver_name, | 399 | printk(KERN_NOTICE "%s: FW capabilities:0x%x\n", netxen_nic_driver_name, |
| 400 | adapter->intr_scheme); | 400 | adapter->intr_scheme); |
| 401 | adapter->msi_mode = readl( | ||
| 402 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_FW)); | ||
| 401 | DPRINTK(INFO, "Receive Peg ready too. starting stuff\n"); | 403 | DPRINTK(INFO, "Receive Peg ready too. starting stuff\n"); |
| 402 | 404 | ||
| 403 | addr = netxen_alloc(adapter->ahw.pdev, | 405 | addr = netxen_alloc(adapter->ahw.pdev, |
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 9e38bcb3fba9..45fa33e0cb90 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
| @@ -145,6 +145,8 @@ int netxen_init_firmware(struct netxen_adapter *adapter) | |||
| 145 | /* Window 1 call */ | 145 | /* Window 1 call */ |
| 146 | writel(INTR_SCHEME_PERPORT, | 146 | writel(INTR_SCHEME_PERPORT, |
| 147 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_HOST)); | 147 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_HOST)); |
| 148 | writel(MSI_MODE_MULTIFUNC, | ||
| 149 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_HOST)); | ||
| 148 | writel(MPORT_MULTI_FUNCTION_MODE, | 150 | writel(MPORT_MULTI_FUNCTION_MODE, |
| 149 | NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE)); | 151 | NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE)); |
| 150 | writel(PHAN_INITIALIZE_ACK, | 152 | writel(PHAN_INITIALIZE_ACK, |
| @@ -183,7 +185,6 @@ void netxen_initialize_adapter_sw(struct netxen_adapter *adapter) | |||
| 183 | for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) { | 185 | for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) { |
| 184 | struct netxen_rx_buffer *rx_buf; | 186 | struct netxen_rx_buffer *rx_buf; |
| 185 | rcv_desc = &adapter->recv_ctx[ctxid].rcv_desc[ring]; | 187 | rcv_desc = &adapter->recv_ctx[ctxid].rcv_desc[ring]; |
| 186 | rcv_desc->rcv_free = rcv_desc->max_rx_desc_count; | ||
| 187 | rcv_desc->begin_alloc = 0; | 188 | rcv_desc->begin_alloc = 0; |
| 188 | rx_buf = rcv_desc->rx_buf_arr; | 189 | rx_buf = rcv_desc->rx_buf_arr; |
| 189 | num_rx_bufs = rcv_desc->max_rx_desc_count; | 190 | num_rx_bufs = rcv_desc->max_rx_desc_count; |
| @@ -974,28 +975,6 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val) | |||
| 974 | return 0; | 975 | return 0; |
| 975 | } | 976 | } |
| 976 | 977 | ||
| 977 | int netxen_nic_rx_has_work(struct netxen_adapter *adapter) | ||
| 978 | { | ||
| 979 | int ctx; | ||
| 980 | |||
| 981 | for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) { | ||
| 982 | struct netxen_recv_context *recv_ctx = | ||
| 983 | &(adapter->recv_ctx[ctx]); | ||
| 984 | u32 consumer; | ||
| 985 | struct status_desc *desc_head; | ||
| 986 | struct status_desc *desc; | ||
| 987 | |||
| 988 | consumer = recv_ctx->status_rx_consumer; | ||
| 989 | desc_head = recv_ctx->rcv_status_desc_head; | ||
| 990 | desc = &desc_head[consumer]; | ||
| 991 | |||
| 992 | if (netxen_get_sts_owner(desc) & STATUS_OWNER_HOST) | ||
| 993 | return 1; | ||
| 994 | } | ||
| 995 | |||
| 996 | return 0; | ||
| 997 | } | ||
| 998 | |||
| 999 | static int netxen_nic_check_temp(struct netxen_adapter *adapter) | 978 | static int netxen_nic_check_temp(struct netxen_adapter *adapter) |
| 1000 | { | 979 | { |
| 1001 | struct net_device *netdev = adapter->netdev; | 980 | struct net_device *netdev = adapter->netdev; |
| @@ -1038,7 +1017,6 @@ static int netxen_nic_check_temp(struct netxen_adapter *adapter) | |||
| 1038 | 1017 | ||
| 1039 | void netxen_watchdog_task(struct work_struct *work) | 1018 | void netxen_watchdog_task(struct work_struct *work) |
| 1040 | { | 1019 | { |
| 1041 | struct net_device *netdev; | ||
| 1042 | struct netxen_adapter *adapter = | 1020 | struct netxen_adapter *adapter = |
| 1043 | container_of(work, struct netxen_adapter, watchdog_task); | 1021 | container_of(work, struct netxen_adapter, watchdog_task); |
| 1044 | 1022 | ||
| @@ -1048,20 +1026,6 @@ void netxen_watchdog_task(struct work_struct *work) | |||
| 1048 | if (adapter->handle_phy_intr) | 1026 | if (adapter->handle_phy_intr) |
| 1049 | adapter->handle_phy_intr(adapter); | 1027 | adapter->handle_phy_intr(adapter); |
| 1050 | 1028 | ||
| 1051 | netdev = adapter->netdev; | ||
| 1052 | if ((netif_running(netdev)) && !netif_carrier_ok(netdev) && | ||
| 1053 | netxen_nic_link_ok(adapter) ) { | ||
| 1054 | printk(KERN_INFO "%s %s (port %d), Link is up\n", | ||
| 1055 | netxen_nic_driver_name, netdev->name, adapter->portnum); | ||
| 1056 | netif_carrier_on(netdev); | ||
| 1057 | netif_wake_queue(netdev); | ||
| 1058 | } else if(!(netif_running(netdev)) && netif_carrier_ok(netdev)) { | ||
| 1059 | printk(KERN_ERR "%s %s Link is Down\n", | ||
| 1060 | netxen_nic_driver_name, netdev->name); | ||
| 1061 | netif_carrier_off(netdev); | ||
| 1062 | netif_stop_queue(netdev); | ||
| 1063 | } | ||
| 1064 | |||
| 1065 | mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ); | 1029 | mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ); |
| 1066 | } | 1030 | } |
| 1067 | 1031 | ||
| @@ -1125,7 +1089,7 @@ static void netxen_process_rcv(struct netxen_adapter *adapter, int ctxid, | |||
| 1125 | skb = (struct sk_buff *)buffer->skb; | 1089 | skb = (struct sk_buff *)buffer->skb; |
| 1126 | 1090 | ||
| 1127 | if (likely(adapter->rx_csum && | 1091 | if (likely(adapter->rx_csum && |
| 1128 | netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) { | 1092 | netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) { |
| 1129 | adapter->stats.csummed++; | 1093 | adapter->stats.csummed++; |
| 1130 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 1094 | skb->ip_summed = CHECKSUM_UNNECESSARY; |
| 1131 | } else | 1095 | } else |
| @@ -1142,40 +1106,8 @@ static void netxen_process_rcv(struct netxen_adapter *adapter, int ctxid, | |||
| 1142 | skb->protocol = eth_type_trans(skb, netdev); | 1106 | skb->protocol = eth_type_trans(skb, netdev); |
| 1143 | 1107 | ||
| 1144 | ret = netif_receive_skb(skb); | 1108 | ret = netif_receive_skb(skb); |
| 1145 | |||
| 1146 | /* | ||
| 1147 | * RH: Do we need these stats on a regular basis. Can we get it from | ||
| 1148 | * Linux stats. | ||
| 1149 | */ | ||
| 1150 | switch (ret) { | ||
| 1151 | case NET_RX_SUCCESS: | ||
| 1152 | adapter->stats.uphappy++; | ||
| 1153 | break; | ||
| 1154 | |||
| 1155 | case NET_RX_CN_LOW: | ||
| 1156 | adapter->stats.uplcong++; | ||
| 1157 | break; | ||
| 1158 | |||
| 1159 | case NET_RX_CN_MOD: | ||
| 1160 | adapter->stats.upmcong++; | ||
| 1161 | break; | ||
| 1162 | |||
| 1163 | case NET_RX_CN_HIGH: | ||
| 1164 | adapter->stats.uphcong++; | ||
| 1165 | break; | ||
| 1166 | |||
| 1167 | case NET_RX_DROP: | ||
| 1168 | adapter->stats.updropped++; | ||
| 1169 | break; | ||
| 1170 | |||
| 1171 | default: | ||
| 1172 | adapter->stats.updunno++; | ||
| 1173 | break; | ||
| 1174 | } | ||
| 1175 | |||
| 1176 | netdev->last_rx = jiffies; | 1109 | netdev->last_rx = jiffies; |
| 1177 | 1110 | ||
| 1178 | rcv_desc->rcv_free++; | ||
| 1179 | rcv_desc->rcv_pending--; | 1111 | rcv_desc->rcv_pending--; |
| 1180 | 1112 | ||
| 1181 | /* | 1113 | /* |
| @@ -1200,13 +1132,6 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) | |||
| 1200 | u32 producer = 0; | 1132 | u32 producer = 0; |
| 1201 | int count = 0, ring; | 1133 | int count = 0, ring; |
| 1202 | 1134 | ||
| 1203 | DPRINTK(INFO, "procesing receive\n"); | ||
| 1204 | /* | ||
| 1205 | * we assume in this case that there is only one port and that is | ||
| 1206 | * port #1...changes need to be done in firmware to indicate port | ||
| 1207 | * number as part of the descriptor. This way we will be able to get | ||
| 1208 | * the netdev which is associated with that device. | ||
| 1209 | */ | ||
| 1210 | while (count < max) { | 1135 | while (count < max) { |
| 1211 | desc = &desc_head[consumer]; | 1136 | desc = &desc_head[consumer]; |
| 1212 | if (!(netxen_get_sts_owner(desc) & STATUS_OWNER_HOST)) { | 1137 | if (!(netxen_get_sts_owner(desc) & STATUS_OWNER_HOST)) { |
| @@ -1219,11 +1144,8 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) | |||
| 1219 | consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1); | 1144 | consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1); |
| 1220 | count++; | 1145 | count++; |
| 1221 | } | 1146 | } |
| 1222 | if (count) { | 1147 | for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) |
| 1223 | for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) { | 1148 | netxen_post_rx_buffers_nodb(adapter, ctxid, ring); |
| 1224 | netxen_post_rx_buffers_nodb(adapter, ctxid, ring); | ||
| 1225 | } | ||
| 1226 | } | ||
| 1227 | 1149 | ||
| 1228 | /* update the consumer index in phantom */ | 1150 | /* update the consumer index in phantom */ |
| 1229 | if (count) { | 1151 | if (count) { |
| @@ -1233,108 +1155,60 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) | |||
| 1233 | /* Window = 1 */ | 1155 | /* Window = 1 */ |
| 1234 | writel(consumer, | 1156 | writel(consumer, |
| 1235 | NETXEN_CRB_NORMALIZE(adapter, | 1157 | NETXEN_CRB_NORMALIZE(adapter, |
| 1236 | recv_crb_registers[adapter->portnum]. | 1158 | recv_crb_registers[adapter->portnum]. |
| 1237 | crb_rcv_status_consumer)); | 1159 | crb_rcv_status_consumer)); |
| 1238 | wmb(); | ||
| 1239 | } | 1160 | } |
| 1240 | 1161 | ||
| 1241 | return count; | 1162 | return count; |
| 1242 | } | 1163 | } |
| 1243 | 1164 | ||
| 1244 | /* Process Command status ring */ | 1165 | /* Process Command status ring */ |
| 1245 | int netxen_process_cmd_ring(unsigned long data) | 1166 | int netxen_process_cmd_ring(struct netxen_adapter *adapter) |
| 1246 | { | 1167 | { |
| 1247 | u32 last_consumer; | 1168 | u32 last_consumer, consumer; |
| 1248 | u32 consumer; | 1169 | int count = 0, i; |
| 1249 | struct netxen_adapter *adapter = (struct netxen_adapter *)data; | ||
| 1250 | int count1 = 0; | ||
| 1251 | int count2 = 0; | ||
| 1252 | struct netxen_cmd_buffer *buffer; | 1170 | struct netxen_cmd_buffer *buffer; |
| 1253 | struct pci_dev *pdev; | 1171 | struct pci_dev *pdev = adapter->pdev; |
| 1172 | struct net_device *netdev = adapter->netdev; | ||
| 1254 | struct netxen_skb_frag *frag; | 1173 | struct netxen_skb_frag *frag; |
| 1255 | u32 i; | 1174 | int done = 0; |
| 1256 | int done; | ||
| 1257 | 1175 | ||
| 1258 | spin_lock(&adapter->tx_lock); | ||
| 1259 | last_consumer = adapter->last_cmd_consumer; | 1176 | last_consumer = adapter->last_cmd_consumer; |
| 1260 | DPRINTK(INFO, "procesing xmit complete\n"); | ||
| 1261 | /* we assume in this case that there is only one port and that is | ||
| 1262 | * port #1...changes need to be done in firmware to indicate port | ||
| 1263 | * number as part of the descriptor. This way we will be able to get | ||
| 1264 | * the netdev which is associated with that device. | ||
| 1265 | */ | ||
| 1266 | |||
| 1267 | consumer = le32_to_cpu(*(adapter->cmd_consumer)); | 1177 | consumer = le32_to_cpu(*(adapter->cmd_consumer)); |
| 1268 | if (last_consumer == consumer) { /* Ring is empty */ | ||
| 1269 | DPRINTK(INFO, "last_consumer %d == consumer %d\n", | ||
| 1270 | last_consumer, consumer); | ||
| 1271 | spin_unlock(&adapter->tx_lock); | ||
| 1272 | return 1; | ||
| 1273 | } | ||
| 1274 | |||
| 1275 | adapter->proc_cmd_buf_counter++; | ||
| 1276 | /* | ||
| 1277 | * Not needed - does not seem to be used anywhere. | ||
| 1278 | * adapter->cmd_consumer = consumer; | ||
| 1279 | */ | ||
| 1280 | spin_unlock(&adapter->tx_lock); | ||
| 1281 | 1178 | ||
| 1282 | while ((last_consumer != consumer) && (count1 < MAX_STATUS_HANDLE)) { | 1179 | while (last_consumer != consumer) { |
| 1283 | buffer = &adapter->cmd_buf_arr[last_consumer]; | 1180 | buffer = &adapter->cmd_buf_arr[last_consumer]; |
| 1284 | pdev = adapter->pdev; | ||
| 1285 | if (buffer->skb) { | 1181 | if (buffer->skb) { |
| 1286 | frag = &buffer->frag_array[0]; | 1182 | frag = &buffer->frag_array[0]; |
| 1287 | pci_unmap_single(pdev, frag->dma, frag->length, | 1183 | pci_unmap_single(pdev, frag->dma, frag->length, |
| 1288 | PCI_DMA_TODEVICE); | 1184 | PCI_DMA_TODEVICE); |
| 1289 | frag->dma = 0ULL; | 1185 | frag->dma = 0ULL; |
| 1290 | for (i = 1; i < buffer->frag_count; i++) { | 1186 | for (i = 1; i < buffer->frag_count; i++) { |
| 1291 | DPRINTK(INFO, "getting fragment no %d\n", i); | ||
| 1292 | frag++; /* Get the next frag */ | 1187 | frag++; /* Get the next frag */ |
| 1293 | pci_unmap_page(pdev, frag->dma, frag->length, | 1188 | pci_unmap_page(pdev, frag->dma, frag->length, |
| 1294 | PCI_DMA_TODEVICE); | 1189 | PCI_DMA_TODEVICE); |
| 1295 | frag->dma = 0ULL; | 1190 | frag->dma = 0ULL; |
| 1296 | } | 1191 | } |
| 1297 | 1192 | ||
| 1298 | adapter->stats.skbfreed++; | 1193 | adapter->stats.xmitfinished++; |
| 1299 | dev_kfree_skb_any(buffer->skb); | 1194 | dev_kfree_skb_any(buffer->skb); |
| 1300 | buffer->skb = NULL; | 1195 | buffer->skb = NULL; |
| 1301 | } else if (adapter->proc_cmd_buf_counter == 1) { | ||
| 1302 | adapter->stats.txnullskb++; | ||
| 1303 | } | ||
| 1304 | if (unlikely(netif_queue_stopped(adapter->netdev) | ||
| 1305 | && netif_carrier_ok(adapter->netdev)) | ||
| 1306 | && ((jiffies - adapter->netdev->trans_start) > | ||
| 1307 | adapter->netdev->watchdog_timeo)) { | ||
| 1308 | SCHEDULE_WORK(&adapter->tx_timeout_task); | ||
| 1309 | } | 1196 | } |
| 1310 | 1197 | ||
| 1311 | last_consumer = get_next_index(last_consumer, | 1198 | last_consumer = get_next_index(last_consumer, |
| 1312 | adapter->max_tx_desc_count); | 1199 | adapter->max_tx_desc_count); |
| 1313 | count1++; | 1200 | if (++count >= MAX_STATUS_HANDLE) |
| 1201 | break; | ||
| 1314 | } | 1202 | } |
| 1315 | 1203 | ||
| 1316 | count2 = 0; | 1204 | if (count) { |
| 1317 | spin_lock(&adapter->tx_lock); | ||
| 1318 | if ((--adapter->proc_cmd_buf_counter) == 0) { | ||
| 1319 | adapter->last_cmd_consumer = last_consumer; | 1205 | adapter->last_cmd_consumer = last_consumer; |
| 1320 | while ((adapter->last_cmd_consumer != consumer) | 1206 | smp_mb(); |
| 1321 | && (count2 < MAX_STATUS_HANDLE)) { | 1207 | if (netif_queue_stopped(netdev) && netif_running(netdev)) { |
| 1322 | buffer = | 1208 | netif_tx_lock(netdev); |
| 1323 | &adapter->cmd_buf_arr[adapter->last_cmd_consumer]; | 1209 | netif_wake_queue(netdev); |
| 1324 | count2++; | 1210 | smp_mb(); |
| 1325 | if (buffer->skb) | 1211 | netif_tx_unlock(netdev); |
| 1326 | break; | ||
| 1327 | else | ||
| 1328 | adapter->last_cmd_consumer = | ||
| 1329 | get_next_index(adapter->last_cmd_consumer, | ||
| 1330 | adapter->max_tx_desc_count); | ||
| 1331 | } | ||
| 1332 | } | ||
| 1333 | if (count1 || count2) { | ||
| 1334 | if (netif_queue_stopped(adapter->netdev) | ||
| 1335 | && (adapter->flags & NETXEN_NETDEV_STATUS)) { | ||
| 1336 | netif_wake_queue(adapter->netdev); | ||
| 1337 | adapter->flags &= ~NETXEN_NETDEV_STATUS; | ||
| 1338 | } | 1212 | } |
| 1339 | } | 1213 | } |
| 1340 | /* | 1214 | /* |
| @@ -1350,16 +1224,9 @@ int netxen_process_cmd_ring(unsigned long data) | |||
| 1350 | * There is still a possible race condition and the host could miss an | 1224 | * There is still a possible race condition and the host could miss an |
| 1351 | * interrupt. The card has to take care of this. | 1225 | * interrupt. The card has to take care of this. |
| 1352 | */ | 1226 | */ |
| 1353 | if (adapter->last_cmd_consumer == consumer && | 1227 | consumer = le32_to_cpu(*(adapter->cmd_consumer)); |
| 1354 | (((adapter->cmd_producer + 1) % | 1228 | done = (last_consumer == consumer); |
| 1355 | adapter->max_tx_desc_count) == adapter->last_cmd_consumer)) { | ||
| 1356 | consumer = le32_to_cpu(*(adapter->cmd_consumer)); | ||
| 1357 | } | ||
| 1358 | done = (adapter->last_cmd_consumer == consumer); | ||
| 1359 | 1229 | ||
| 1360 | spin_unlock(&adapter->tx_lock); | ||
| 1361 | DPRINTK(INFO, "last consumer is %d in %s\n", last_consumer, | ||
| 1362 | __FUNCTION__); | ||
| 1363 | return (done); | 1230 | return (done); |
| 1364 | } | 1231 | } |
| 1365 | 1232 | ||
| @@ -1433,8 +1300,6 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid) | |||
| 1433 | rcv_desc->begin_alloc = index; | 1300 | rcv_desc->begin_alloc = index; |
| 1434 | rcv_desc->rcv_pending += count; | 1301 | rcv_desc->rcv_pending += count; |
| 1435 | rcv_desc->producer = producer; | 1302 | rcv_desc->producer = producer; |
| 1436 | if (rcv_desc->rcv_free >= 32) { | ||
| 1437 | rcv_desc->rcv_free = 0; | ||
| 1438 | /* Window = 1 */ | 1303 | /* Window = 1 */ |
| 1439 | writel((producer - 1) & | 1304 | writel((producer - 1) & |
| 1440 | (rcv_desc->max_rx_desc_count - 1), | 1305 | (rcv_desc->max_rx_desc_count - 1), |
| @@ -1458,8 +1323,6 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid) | |||
| 1458 | writel(msg, | 1323 | writel(msg, |
| 1459 | DB_NORMALIZE(adapter, | 1324 | DB_NORMALIZE(adapter, |
| 1460 | NETXEN_RCV_PRODUCER_OFFSET)); | 1325 | NETXEN_RCV_PRODUCER_OFFSET)); |
| 1461 | wmb(); | ||
| 1462 | } | ||
| 1463 | } | 1326 | } |
| 1464 | } | 1327 | } |
| 1465 | 1328 | ||
| @@ -1523,8 +1386,6 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, | |||
| 1523 | rcv_desc->begin_alloc = index; | 1386 | rcv_desc->begin_alloc = index; |
| 1524 | rcv_desc->rcv_pending += count; | 1387 | rcv_desc->rcv_pending += count; |
| 1525 | rcv_desc->producer = producer; | 1388 | rcv_desc->producer = producer; |
| 1526 | if (rcv_desc->rcv_free >= 32) { | ||
| 1527 | rcv_desc->rcv_free = 0; | ||
| 1528 | /* Window = 1 */ | 1389 | /* Window = 1 */ |
| 1529 | writel((producer - 1) & | 1390 | writel((producer - 1) & |
| 1530 | (rcv_desc->max_rx_desc_count - 1), | 1391 | (rcv_desc->max_rx_desc_count - 1), |
| @@ -1534,21 +1395,9 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, | |||
| 1534 | rcv_desc_crb[ringid]. | 1395 | rcv_desc_crb[ringid]. |
| 1535 | crb_rcv_producer_offset)); | 1396 | crb_rcv_producer_offset)); |
| 1536 | wmb(); | 1397 | wmb(); |
| 1537 | } | ||
| 1538 | } | 1398 | } |
| 1539 | } | 1399 | } |
| 1540 | 1400 | ||
| 1541 | int netxen_nic_tx_has_work(struct netxen_adapter *adapter) | ||
| 1542 | { | ||
| 1543 | if (find_diff_among(adapter->last_cmd_consumer, | ||
| 1544 | adapter->cmd_producer, | ||
| 1545 | adapter->max_tx_desc_count) > 0) | ||
| 1546 | return 1; | ||
| 1547 | |||
| 1548 | return 0; | ||
| 1549 | } | ||
| 1550 | |||
| 1551 | |||
| 1552 | void netxen_nic_clear_stats(struct netxen_adapter *adapter) | 1401 | void netxen_nic_clear_stats(struct netxen_adapter *adapter) |
| 1553 | { | 1402 | { |
| 1554 | memset(&adapter->stats, 0, sizeof(adapter->stats)); | 1403 | memset(&adapter->stats, 0, sizeof(adapter->stats)); |
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c index 48a404aa66ce..c81313b717bd 100644 --- a/drivers/net/netxen/netxen_nic_isr.c +++ b/drivers/net/netxen/netxen_nic_isr.c | |||
| @@ -59,7 +59,7 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev) | |||
| 59 | /* packet transmit problems */ | 59 | /* packet transmit problems */ |
| 60 | stats->tx_errors = adapter->stats.nocmddescriptor; | 60 | stats->tx_errors = adapter->stats.nocmddescriptor; |
| 61 | /* no space in linux buffers */ | 61 | /* no space in linux buffers */ |
| 62 | stats->rx_dropped = adapter->stats.updropped; | 62 | stats->rx_dropped = adapter->stats.rxdropped; |
| 63 | /* no space available in linux */ | 63 | /* no space available in linux */ |
| 64 | stats->tx_dropped = adapter->stats.txdropped; | 64 | stats->tx_dropped = adapter->stats.txdropped; |
| 65 | 65 | ||
| @@ -193,14 +193,14 @@ int netxen_nic_link_ok(struct netxen_adapter *adapter) | |||
| 193 | void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter) | 193 | void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter) |
| 194 | { | 194 | { |
| 195 | struct net_device *netdev = adapter->netdev; | 195 | struct net_device *netdev = adapter->netdev; |
| 196 | u32 val, val1; | 196 | u32 val; |
| 197 | 197 | ||
| 198 | /* WINDOW = 1 */ | 198 | /* WINDOW = 1 */ |
| 199 | val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); | 199 | val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); |
| 200 | val >>= (physical_port[adapter->portnum] * 8); | 200 | val >>= (physical_port[adapter->portnum] * 8); |
| 201 | val1 = val & 0xff; | 201 | val &= 0xff; |
| 202 | 202 | ||
| 203 | if (adapter->ahw.xg_linkup == 1 && val1 != XG_LINK_UP) { | 203 | if (adapter->ahw.xg_linkup == 1 && val != XG_LINK_UP) { |
| 204 | printk(KERN_INFO "%s: %s NIC Link is down\n", | 204 | printk(KERN_INFO "%s: %s NIC Link is down\n", |
| 205 | netxen_nic_driver_name, netdev->name); | 205 | netxen_nic_driver_name, netdev->name); |
| 206 | adapter->ahw.xg_linkup = 0; | 206 | adapter->ahw.xg_linkup = 0; |
| @@ -208,16 +208,7 @@ void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter) | |||
| 208 | netif_carrier_off(netdev); | 208 | netif_carrier_off(netdev); |
| 209 | netif_stop_queue(netdev); | 209 | netif_stop_queue(netdev); |
| 210 | } | 210 | } |
| 211 | /* read twice to clear sticky bits */ | 211 | } else if (adapter->ahw.xg_linkup == 0 && val == XG_LINK_UP) { |
| 212 | /* WINDOW = 0 */ | ||
| 213 | netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val1); | ||
| 214 | netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val1); | ||
| 215 | |||
| 216 | if ((val & 0xffb) != 0xffb) { | ||
| 217 | printk(KERN_INFO "%s ISR: Sync/Align BAD: 0x%08x\n", | ||
| 218 | netxen_nic_driver_name, val1); | ||
| 219 | } | ||
| 220 | } else if (adapter->ahw.xg_linkup == 0 && val1 == XG_LINK_UP) { | ||
| 221 | printk(KERN_INFO "%s: %s NIC Link is up\n", | 212 | printk(KERN_INFO "%s: %s NIC Link is up\n", |
| 222 | netxen_nic_driver_name, netdev->name); | 213 | netxen_nic_driver_name, netdev->name); |
| 223 | adapter->ahw.xg_linkup = 1; | 214 | adapter->ahw.xg_linkup = 1; |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 9737eae5ef11..a8fb439a4d03 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -63,12 +63,12 @@ static int netxen_nic_xmit_frame(struct sk_buff *, struct net_device *); | |||
| 63 | static void netxen_tx_timeout(struct net_device *netdev); | 63 | static void netxen_tx_timeout(struct net_device *netdev); |
| 64 | static void netxen_tx_timeout_task(struct work_struct *work); | 64 | static void netxen_tx_timeout_task(struct work_struct *work); |
| 65 | static void netxen_watchdog(unsigned long); | 65 | static void netxen_watchdog(unsigned long); |
| 66 | static int netxen_handle_int(struct netxen_adapter *, struct net_device *); | ||
| 67 | static int netxen_nic_poll(struct napi_struct *napi, int budget); | 66 | static int netxen_nic_poll(struct napi_struct *napi, int budget); |
| 68 | #ifdef CONFIG_NET_POLL_CONTROLLER | 67 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 69 | static void netxen_nic_poll_controller(struct net_device *netdev); | 68 | static void netxen_nic_poll_controller(struct net_device *netdev); |
| 70 | #endif | 69 | #endif |
| 71 | static irqreturn_t netxen_intr(int irq, void *data); | 70 | static irqreturn_t netxen_intr(int irq, void *data); |
| 71 | static irqreturn_t netxen_msi_intr(int irq, void *data); | ||
| 72 | 72 | ||
| 73 | int physical_port[] = {0, 1, 2, 3}; | 73 | int physical_port[] = {0, 1, 2, 3}; |
| 74 | 74 | ||
| @@ -149,33 +149,30 @@ static void netxen_nic_update_cmd_consumer(struct netxen_adapter *adapter, | |||
| 149 | 149 | ||
| 150 | #define ADAPTER_LIST_SIZE 12 | 150 | #define ADAPTER_LIST_SIZE 12 |
| 151 | 151 | ||
| 152 | static uint32_t msi_tgt_status[4] = { | ||
| 153 | ISR_INT_TARGET_STATUS, ISR_INT_TARGET_STATUS_F1, | ||
| 154 | ISR_INT_TARGET_STATUS_F2, ISR_INT_TARGET_STATUS_F3 | ||
| 155 | }; | ||
| 156 | |||
| 157 | static uint32_t sw_int_mask[4] = { | ||
| 158 | CRB_SW_INT_MASK_0, CRB_SW_INT_MASK_1, | ||
| 159 | CRB_SW_INT_MASK_2, CRB_SW_INT_MASK_3 | ||
| 160 | }; | ||
| 161 | |||
| 152 | static void netxen_nic_disable_int(struct netxen_adapter *adapter) | 162 | static void netxen_nic_disable_int(struct netxen_adapter *adapter) |
| 153 | { | 163 | { |
| 154 | uint32_t mask = 0x7ff; | 164 | u32 mask = 0x7ff; |
| 155 | int retries = 32; | 165 | int retries = 32; |
| 166 | int port = adapter->portnum; | ||
| 167 | int pci_fn = adapter->ahw.pci_func; | ||
| 156 | 168 | ||
| 157 | DPRINTK(1, INFO, "Entered ISR Disable \n"); | 169 | if (adapter->msi_mode != MSI_MODE_MULTIFUNC) |
| 158 | 170 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port])); | |
| 159 | switch (adapter->portnum) { | ||
| 160 | case 0: | ||
| 161 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_0)); | ||
| 162 | break; | ||
| 163 | case 1: | ||
| 164 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_1)); | ||
| 165 | break; | ||
| 166 | case 2: | ||
| 167 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_2)); | ||
| 168 | break; | ||
| 169 | case 3: | ||
| 170 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_3)); | ||
| 171 | break; | ||
| 172 | } | ||
| 173 | 171 | ||
| 174 | if (adapter->intr_scheme != -1 && | 172 | if (adapter->intr_scheme != -1 && |
| 175 | adapter->intr_scheme != INTR_SCHEME_PERPORT) | 173 | adapter->intr_scheme != INTR_SCHEME_PERPORT) |
| 176 | writel(mask,PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK)); | 174 | writel(mask,PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK)); |
| 177 | 175 | ||
| 178 | /* Window = 0 or 1 */ | ||
| 179 | if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { | 176 | if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { |
| 180 | do { | 177 | do { |
| 181 | writel(0xffffffff, | 178 | writel(0xffffffff, |
| @@ -190,14 +187,18 @@ static void netxen_nic_disable_int(struct netxen_adapter *adapter) | |||
| 190 | printk(KERN_NOTICE "%s: Failed to disable interrupt completely\n", | 187 | printk(KERN_NOTICE "%s: Failed to disable interrupt completely\n", |
| 191 | netxen_nic_driver_name); | 188 | netxen_nic_driver_name); |
| 192 | } | 189 | } |
| 190 | } else { | ||
| 191 | if (adapter->msi_mode == MSI_MODE_MULTIFUNC) { | ||
| 192 | writel(0xffffffff, PCI_OFFSET_SECOND_RANGE(adapter, | ||
| 193 | msi_tgt_status[pci_fn])); | ||
| 194 | } | ||
| 193 | } | 195 | } |
| 194 | |||
| 195 | DPRINTK(1, INFO, "Done with Disable Int\n"); | ||
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | static void netxen_nic_enable_int(struct netxen_adapter *adapter) | 198 | static void netxen_nic_enable_int(struct netxen_adapter *adapter) |
| 199 | { | 199 | { |
| 200 | u32 mask; | 200 | u32 mask; |
| 201 | int port = adapter->portnum; | ||
| 201 | 202 | ||
| 202 | DPRINTK(1, INFO, "Entered ISR Enable \n"); | 203 | DPRINTK(1, INFO, "Entered ISR Enable \n"); |
| 203 | 204 | ||
| @@ -218,20 +219,7 @@ static void netxen_nic_enable_int(struct netxen_adapter *adapter) | |||
| 218 | writel(mask, PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK)); | 219 | writel(mask, PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK)); |
| 219 | } | 220 | } |
| 220 | 221 | ||
| 221 | switch (adapter->portnum) { | 222 | writel(0x1, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port])); |
| 222 | case 0: | ||
| 223 | writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_0)); | ||
| 224 | break; | ||
| 225 | case 1: | ||
| 226 | writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_1)); | ||
| 227 | break; | ||
| 228 | case 2: | ||
| 229 | writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_2)); | ||
| 230 | break; | ||
| 231 | case 3: | ||
| 232 | writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_3)); | ||
| 233 | break; | ||
| 234 | } | ||
| 235 | 223 | ||
| 236 | if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { | 224 | if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { |
| 237 | mask = 0xbff; | 225 | mask = 0xbff; |
| @@ -328,7 +316,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 328 | 316 | ||
| 329 | adapter->ahw.pdev = pdev; | 317 | adapter->ahw.pdev = pdev; |
| 330 | adapter->ahw.pci_func = pci_func_id; | 318 | adapter->ahw.pci_func = pci_func_id; |
| 331 | spin_lock_init(&adapter->tx_lock); | ||
| 332 | 319 | ||
| 333 | /* remap phys address */ | 320 | /* remap phys address */ |
| 334 | mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */ | 321 | mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */ |
| @@ -401,6 +388,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 401 | 388 | ||
| 402 | /* this will be read from FW later */ | 389 | /* this will be read from FW later */ |
| 403 | adapter->intr_scheme = -1; | 390 | adapter->intr_scheme = -1; |
| 391 | adapter->msi_mode = -1; | ||
| 404 | 392 | ||
| 405 | /* This will be reset for mezz cards */ | 393 | /* This will be reset for mezz cards */ |
| 406 | adapter->portnum = pci_func_id; | 394 | adapter->portnum = pci_func_id; |
| @@ -415,7 +403,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 415 | netdev->set_mac_address = netxen_nic_set_mac; | 403 | netdev->set_mac_address = netxen_nic_set_mac; |
| 416 | netdev->change_mtu = netxen_nic_change_mtu; | 404 | netdev->change_mtu = netxen_nic_change_mtu; |
| 417 | netdev->tx_timeout = netxen_tx_timeout; | 405 | netdev->tx_timeout = netxen_tx_timeout; |
| 418 | netdev->watchdog_timeo = HZ; | 406 | netdev->watchdog_timeo = 2*HZ; |
| 419 | 407 | ||
| 420 | netxen_nic_change_mtu(netdev, netdev->mtu); | 408 | netxen_nic_change_mtu(netdev, netdev->mtu); |
| 421 | 409 | ||
| @@ -543,7 +531,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 543 | adapter->watchdog_timer.data = (unsigned long)adapter; | 531 | adapter->watchdog_timer.data = (unsigned long)adapter; |
| 544 | INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task); | 532 | INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task); |
| 545 | adapter->ahw.pdev = pdev; | 533 | adapter->ahw.pdev = pdev; |
| 546 | adapter->proc_cmd_buf_counter = 0; | ||
| 547 | adapter->ahw.revision_id = pdev->revision; | 534 | adapter->ahw.revision_id = pdev->revision; |
| 548 | 535 | ||
| 549 | /* make sure Window == 1 */ | 536 | /* make sure Window == 1 */ |
| @@ -833,6 +820,8 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 833 | struct netxen_adapter *adapter = (struct netxen_adapter *)netdev->priv; | 820 | struct netxen_adapter *adapter = (struct netxen_adapter *)netdev->priv; |
| 834 | int err = 0; | 821 | int err = 0; |
| 835 | int ctx, ring; | 822 | int ctx, ring; |
| 823 | irq_handler_t handler; | ||
| 824 | unsigned long flags = IRQF_SAMPLE_RANDOM; | ||
| 836 | 825 | ||
| 837 | if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC) { | 826 | if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC) { |
| 838 | err = netxen_init_firmware(adapter); | 827 | err = netxen_init_firmware(adapter); |
| @@ -856,9 +845,14 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 856 | netxen_post_rx_buffers(adapter, ctx, ring); | 845 | netxen_post_rx_buffers(adapter, ctx, ring); |
| 857 | } | 846 | } |
| 858 | adapter->irq = adapter->ahw.pdev->irq; | 847 | adapter->irq = adapter->ahw.pdev->irq; |
| 859 | err = request_irq(adapter->ahw.pdev->irq, netxen_intr, | 848 | if (adapter->flags & NETXEN_NIC_MSI_ENABLED) |
| 860 | IRQF_SHARED|IRQF_SAMPLE_RANDOM, netdev->name, | 849 | handler = netxen_msi_intr; |
| 861 | adapter); | 850 | else { |
| 851 | flags |= IRQF_SHARED; | ||
| 852 | handler = netxen_intr; | ||
| 853 | } | ||
| 854 | err = request_irq(adapter->irq, handler, | ||
| 855 | flags, netdev->name, adapter); | ||
| 862 | if (err) { | 856 | if (err) { |
| 863 | printk(KERN_ERR "request_irq failed with: %d\n", err); | 857 | printk(KERN_ERR "request_irq failed with: %d\n", err); |
| 864 | netxen_free_hw_resources(adapter); | 858 | netxen_free_hw_resources(adapter); |
| @@ -867,21 +861,12 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 867 | 861 | ||
| 868 | adapter->is_up = NETXEN_ADAPTER_UP_MAGIC; | 862 | adapter->is_up = NETXEN_ADAPTER_UP_MAGIC; |
| 869 | } | 863 | } |
| 870 | if (!adapter->driver_mismatch) | ||
| 871 | mod_timer(&adapter->watchdog_timer, jiffies); | ||
| 872 | |||
| 873 | napi_enable(&adapter->napi); | ||
| 874 | |||
| 875 | netxen_nic_enable_int(adapter); | ||
| 876 | |||
| 877 | /* Done here again so that even if phantom sw overwrote it, | 864 | /* Done here again so that even if phantom sw overwrote it, |
| 878 | * we set it */ | 865 | * we set it */ |
| 879 | if (adapter->init_port | 866 | if (adapter->init_port |
| 880 | && adapter->init_port(adapter, adapter->portnum) != 0) { | 867 | && adapter->init_port(adapter, adapter->portnum) != 0) { |
| 881 | del_timer_sync(&adapter->watchdog_timer); | ||
| 882 | printk(KERN_ERR "%s: Failed to initialize port %d\n", | 868 | printk(KERN_ERR "%s: Failed to initialize port %d\n", |
| 883 | netxen_nic_driver_name, adapter->portnum); | 869 | netxen_nic_driver_name, adapter->portnum); |
| 884 | napi_disable(&adapter->napi); | ||
| 885 | return -EIO; | 870 | return -EIO; |
| 886 | } | 871 | } |
| 887 | if (adapter->macaddr_set) | 872 | if (adapter->macaddr_set) |
| @@ -894,6 +879,12 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 894 | adapter->set_mtu(adapter, netdev->mtu); | 879 | adapter->set_mtu(adapter, netdev->mtu); |
| 895 | 880 | ||
| 896 | if (!adapter->driver_mismatch) | 881 | if (!adapter->driver_mismatch) |
| 882 | mod_timer(&adapter->watchdog_timer, jiffies); | ||
| 883 | |||
| 884 | napi_enable(&adapter->napi); | ||
| 885 | netxen_nic_enable_int(adapter); | ||
| 886 | |||
| 887 | if (!adapter->driver_mismatch) | ||
| 897 | netif_start_queue(netdev); | 888 | netif_start_queue(netdev); |
| 898 | 889 | ||
| 899 | return 0; | 890 | return 0; |
| @@ -958,41 +949,17 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 958 | struct netxen_skb_frag *buffrag; | 949 | struct netxen_skb_frag *buffrag; |
| 959 | unsigned int i; | 950 | unsigned int i; |
| 960 | 951 | ||
| 961 | u32 producer = 0; | 952 | u32 producer, consumer; |
| 962 | u32 saved_producer = 0; | 953 | u32 saved_producer = 0; |
| 963 | struct cmd_desc_type0 *hwdesc; | 954 | struct cmd_desc_type0 *hwdesc; |
| 964 | int k; | 955 | int k; |
| 965 | struct netxen_cmd_buffer *pbuf = NULL; | 956 | struct netxen_cmd_buffer *pbuf = NULL; |
| 966 | static int dropped_packet = 0; | ||
| 967 | int frag_count; | 957 | int frag_count; |
| 968 | u32 local_producer = 0; | ||
| 969 | u32 max_tx_desc_count = 0; | ||
| 970 | u32 last_cmd_consumer = 0; | ||
| 971 | int no_of_desc; | 958 | int no_of_desc; |
| 959 | u32 num_txd = adapter->max_tx_desc_count; | ||
| 972 | 960 | ||
| 973 | adapter->stats.xmitcalled++; | ||
| 974 | frag_count = skb_shinfo(skb)->nr_frags + 1; | 961 | frag_count = skb_shinfo(skb)->nr_frags + 1; |
| 975 | 962 | ||
| 976 | if (unlikely(skb->len <= 0)) { | ||
| 977 | dev_kfree_skb_any(skb); | ||
| 978 | adapter->stats.badskblen++; | ||
| 979 | return NETDEV_TX_OK; | ||
| 980 | } | ||
| 981 | |||
| 982 | if (frag_count > MAX_BUFFERS_PER_CMD) { | ||
| 983 | printk("%s: %s netxen_nic_xmit_frame: frag_count (%d) " | ||
| 984 | "too large, can handle only %d frags\n", | ||
| 985 | netxen_nic_driver_name, netdev->name, | ||
| 986 | frag_count, MAX_BUFFERS_PER_CMD); | ||
| 987 | adapter->stats.txdropped++; | ||
| 988 | if ((++dropped_packet & 0xff) == 0xff) | ||
| 989 | printk("%s: %s droppped packets = %d\n", | ||
| 990 | netxen_nic_driver_name, netdev->name, | ||
| 991 | dropped_packet); | ||
| 992 | |||
| 993 | return NETDEV_TX_OK; | ||
| 994 | } | ||
| 995 | |||
| 996 | /* There 4 fragments per descriptor */ | 963 | /* There 4 fragments per descriptor */ |
| 997 | no_of_desc = (frag_count + 3) >> 2; | 964 | no_of_desc = (frag_count + 3) >> 2; |
| 998 | if (netdev->features & NETIF_F_TSO) { | 965 | if (netdev->features & NETIF_F_TSO) { |
| @@ -1007,27 +974,16 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 1007 | } | 974 | } |
| 1008 | } | 975 | } |
| 1009 | 976 | ||
| 1010 | spin_lock_bh(&adapter->tx_lock); | 977 | producer = adapter->cmd_producer; |
| 1011 | if (adapter->total_threads >= MAX_XMIT_PRODUCERS) { | 978 | smp_mb(); |
| 1012 | goto out_requeue; | 979 | consumer = adapter->last_cmd_consumer; |
| 1013 | } | 980 | if ((no_of_desc+2) > find_diff_among(producer, consumer, num_txd)) { |
| 1014 | local_producer = adapter->cmd_producer; | 981 | netif_stop_queue(netdev); |
| 1015 | k = adapter->cmd_producer; | 982 | smp_mb(); |
| 1016 | max_tx_desc_count = adapter->max_tx_desc_count; | 983 | return NETDEV_TX_BUSY; |
| 1017 | last_cmd_consumer = adapter->last_cmd_consumer; | ||
| 1018 | if ((k + no_of_desc) >= | ||
| 1019 | ((last_cmd_consumer <= k) ? last_cmd_consumer + max_tx_desc_count : | ||
| 1020 | last_cmd_consumer)) { | ||
| 1021 | goto out_requeue; | ||
| 1022 | } | 984 | } |
| 1023 | k = get_index_range(k, max_tx_desc_count, no_of_desc); | ||
| 1024 | adapter->cmd_producer = k; | ||
| 1025 | adapter->total_threads++; | ||
| 1026 | adapter->num_threads++; | ||
| 1027 | 985 | ||
| 1028 | spin_unlock_bh(&adapter->tx_lock); | ||
| 1029 | /* Copy the descriptors into the hardware */ | 986 | /* Copy the descriptors into the hardware */ |
| 1030 | producer = local_producer; | ||
| 1031 | saved_producer = producer; | 987 | saved_producer = producer; |
| 1032 | hwdesc = &hw->cmd_desc_head[producer]; | 988 | hwdesc = &hw->cmd_desc_head[producer]; |
| 1033 | memset(hwdesc, 0, sizeof(struct cmd_desc_type0)); | 989 | memset(hwdesc, 0, sizeof(struct cmd_desc_type0)); |
| @@ -1067,8 +1023,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 1067 | /* move to next desc. if there is a need */ | 1023 | /* move to next desc. if there is a need */ |
| 1068 | if ((i & 0x3) == 0) { | 1024 | if ((i & 0x3) == 0) { |
| 1069 | k = 0; | 1025 | k = 0; |
| 1070 | producer = get_next_index(producer, | 1026 | producer = get_next_index(producer, num_txd); |
| 1071 | adapter->max_tx_desc_count); | ||
| 1072 | hwdesc = &hw->cmd_desc_head[producer]; | 1027 | hwdesc = &hw->cmd_desc_head[producer]; |
| 1073 | memset(hwdesc, 0, sizeof(struct cmd_desc_type0)); | 1028 | memset(hwdesc, 0, sizeof(struct cmd_desc_type0)); |
| 1074 | pbuf = &adapter->cmd_buf_arr[producer]; | 1029 | pbuf = &adapter->cmd_buf_arr[producer]; |
| @@ -1086,7 +1041,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 1086 | buffrag->dma = temp_dma; | 1041 | buffrag->dma = temp_dma; |
| 1087 | buffrag->length = temp_len; | 1042 | buffrag->length = temp_len; |
| 1088 | 1043 | ||
| 1089 | DPRINTK(INFO, "for loop. i=%d k=%d\n", i, k); | ||
| 1090 | switch (k) { | 1044 | switch (k) { |
| 1091 | case 0: | 1045 | case 0: |
| 1092 | hwdesc->buffer1_length = cpu_to_le16(temp_len); | 1046 | hwdesc->buffer1_length = cpu_to_le16(temp_len); |
| @@ -1107,7 +1061,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 1107 | } | 1061 | } |
| 1108 | frag++; | 1062 | frag++; |
| 1109 | } | 1063 | } |
| 1110 | producer = get_next_index(producer, adapter->max_tx_desc_count); | 1064 | producer = get_next_index(producer, num_txd); |
| 1111 | 1065 | ||
| 1112 | /* might change opcode to TX_TCP_LSO */ | 1066 | /* might change opcode to TX_TCP_LSO */ |
| 1113 | netxen_tso_check(adapter, &hw->cmd_desc_head[saved_producer], skb); | 1067 | netxen_tso_check(adapter, &hw->cmd_desc_head[saved_producer], skb); |
| @@ -1134,7 +1088,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 1134 | /* copy the first 64 bytes */ | 1088 | /* copy the first 64 bytes */ |
| 1135 | memcpy(((void *)hwdesc) + 2, | 1089 | memcpy(((void *)hwdesc) + 2, |
| 1136 | (void *)(skb->data), first_hdr_len); | 1090 | (void *)(skb->data), first_hdr_len); |
| 1137 | producer = get_next_index(producer, max_tx_desc_count); | 1091 | producer = get_next_index(producer, num_txd); |
| 1138 | 1092 | ||
| 1139 | if (more_hdr) { | 1093 | if (more_hdr) { |
| 1140 | hwdesc = &hw->cmd_desc_head[producer]; | 1094 | hwdesc = &hw->cmd_desc_head[producer]; |
| @@ -1147,35 +1101,19 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 1147 | hwdesc, | 1101 | hwdesc, |
| 1148 | (hdr_len - | 1102 | (hdr_len - |
| 1149 | first_hdr_len)); | 1103 | first_hdr_len)); |
| 1150 | producer = get_next_index(producer, max_tx_desc_count); | 1104 | producer = get_next_index(producer, num_txd); |
| 1151 | } | 1105 | } |
| 1152 | } | 1106 | } |
| 1153 | 1107 | ||
| 1154 | spin_lock_bh(&adapter->tx_lock); | 1108 | adapter->cmd_producer = producer; |
| 1155 | adapter->stats.txbytes += skb->len; | 1109 | adapter->stats.txbytes += skb->len; |
| 1156 | 1110 | ||
| 1157 | /* Code to update the adapter considering how many producer threads | 1111 | netxen_nic_update_cmd_producer(adapter, adapter->cmd_producer); |
| 1158 | are currently working */ | ||
| 1159 | if ((--adapter->num_threads) == 0) { | ||
| 1160 | /* This is the last thread */ | ||
| 1161 | u32 crb_producer = adapter->cmd_producer; | ||
| 1162 | netxen_nic_update_cmd_producer(adapter, crb_producer); | ||
| 1163 | wmb(); | ||
| 1164 | adapter->total_threads = 0; | ||
| 1165 | } | ||
| 1166 | 1112 | ||
| 1167 | adapter->stats.xmitfinished++; | 1113 | adapter->stats.xmitcalled++; |
| 1168 | netdev->trans_start = jiffies; | 1114 | netdev->trans_start = jiffies; |
| 1169 | 1115 | ||
| 1170 | spin_unlock_bh(&adapter->tx_lock); | ||
| 1171 | return NETDEV_TX_OK; | 1116 | return NETDEV_TX_OK; |
| 1172 | |||
| 1173 | out_requeue: | ||
| 1174 | netif_stop_queue(netdev); | ||
| 1175 | adapter->flags |= NETXEN_NETDEV_STATUS; | ||
| 1176 | |||
| 1177 | spin_unlock_bh(&adapter->tx_lock); | ||
| 1178 | return NETDEV_TX_BUSY; | ||
| 1179 | } | 1117 | } |
| 1180 | 1118 | ||
| 1181 | static void netxen_watchdog(unsigned long v) | 1119 | static void netxen_watchdog(unsigned long v) |
| @@ -1200,87 +1138,60 @@ static void netxen_tx_timeout_task(struct work_struct *work) | |||
| 1200 | printk(KERN_ERR "%s %s: transmit timeout, resetting.\n", | 1138 | printk(KERN_ERR "%s %s: transmit timeout, resetting.\n", |
| 1201 | netxen_nic_driver_name, adapter->netdev->name); | 1139 | netxen_nic_driver_name, adapter->netdev->name); |
| 1202 | 1140 | ||
| 1203 | netxen_nic_close(adapter->netdev); | 1141 | netxen_nic_disable_int(adapter); |
| 1204 | netxen_nic_open(adapter->netdev); | 1142 | napi_disable(&adapter->napi); |
| 1143 | |||
| 1205 | adapter->netdev->trans_start = jiffies; | 1144 | adapter->netdev->trans_start = jiffies; |
| 1145 | |||
| 1146 | napi_enable(&adapter->napi); | ||
| 1147 | netxen_nic_enable_int(adapter); | ||
| 1206 | netif_wake_queue(adapter->netdev); | 1148 | netif_wake_queue(adapter->netdev); |
| 1207 | } | 1149 | } |
| 1208 | 1150 | ||
| 1209 | static int | 1151 | static inline void |
| 1210 | netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev) | 1152 | netxen_handle_int(struct netxen_adapter *adapter) |
| 1211 | { | 1153 | { |
| 1212 | u32 ret = 0; | ||
| 1213 | |||
| 1214 | DPRINTK(INFO, "Entered handle ISR\n"); | ||
| 1215 | adapter->stats.ints++; | ||
| 1216 | |||
| 1217 | netxen_nic_disable_int(adapter); | 1154 | netxen_nic_disable_int(adapter); |
| 1218 | 1155 | napi_schedule(&adapter->napi); | |
| 1219 | if (netxen_nic_rx_has_work(adapter) || netxen_nic_tx_has_work(adapter)) { | ||
| 1220 | if (netif_rx_schedule_prep(netdev, &adapter->napi)) { | ||
| 1221 | /* | ||
| 1222 | * Interrupts are already disabled. | ||
| 1223 | */ | ||
| 1224 | __netif_rx_schedule(netdev, &adapter->napi); | ||
| 1225 | } else { | ||
| 1226 | static unsigned int intcount = 0; | ||
| 1227 | if ((++intcount & 0xfff) == 0xfff) | ||
| 1228 | DPRINTK(KERN_ERR | ||
| 1229 | "%s: %s interrupt %d while in poll\n", | ||
| 1230 | netxen_nic_driver_name, netdev->name, | ||
| 1231 | intcount); | ||
| 1232 | } | ||
| 1233 | ret = 1; | ||
| 1234 | } | ||
| 1235 | |||
| 1236 | if (ret == 0) { | ||
| 1237 | netxen_nic_enable_int(adapter); | ||
| 1238 | } | ||
| 1239 | |||
| 1240 | return ret; | ||
| 1241 | } | 1156 | } |
| 1242 | 1157 | ||
| 1243 | /* | ||
| 1244 | * netxen_intr - Interrupt Handler | ||
| 1245 | * @irq: interrupt number | ||
| 1246 | * data points to adapter stucture (which may be handling more than 1 port | ||
| 1247 | */ | ||
| 1248 | irqreturn_t netxen_intr(int irq, void *data) | 1158 | irqreturn_t netxen_intr(int irq, void *data) |
| 1249 | { | 1159 | { |
| 1250 | struct netxen_adapter *adapter = data; | 1160 | struct netxen_adapter *adapter = data; |
| 1251 | struct net_device *netdev = adapter->netdev; | ||
| 1252 | u32 our_int = 0; | 1161 | u32 our_int = 0; |
| 1253 | 1162 | ||
| 1254 | if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { | 1163 | our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR)); |
| 1255 | our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR)); | 1164 | /* not our interrupt */ |
| 1256 | /* not our interrupt */ | 1165 | if ((our_int & (0x80 << adapter->portnum)) == 0) |
| 1257 | if ((our_int & (0x80 << adapter->portnum)) == 0) | 1166 | return IRQ_NONE; |
| 1258 | return IRQ_NONE; | ||
| 1259 | } | ||
| 1260 | 1167 | ||
| 1261 | if (adapter->intr_scheme == INTR_SCHEME_PERPORT) { | 1168 | if (adapter->intr_scheme == INTR_SCHEME_PERPORT) { |
| 1262 | /* claim interrupt */ | 1169 | /* claim interrupt */ |
| 1263 | if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { | 1170 | writel(our_int & ~((u32)(0x80 << adapter->portnum)), |
| 1264 | writel(our_int & ~((u32)(0x80 << adapter->portnum)), | ||
| 1265 | NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR)); | 1171 | NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR)); |
| 1266 | } | ||
| 1267 | } | 1172 | } |
| 1268 | 1173 | ||
| 1269 | if (netif_running(netdev)) | 1174 | netxen_handle_int(adapter); |
| 1270 | netxen_handle_int(adapter, netdev); | ||
| 1271 | 1175 | ||
| 1272 | return IRQ_HANDLED; | 1176 | return IRQ_HANDLED; |
| 1273 | } | 1177 | } |
| 1274 | 1178 | ||
| 1179 | irqreturn_t netxen_msi_intr(int irq, void *data) | ||
| 1180 | { | ||
| 1181 | struct netxen_adapter *adapter = data; | ||
| 1182 | |||
| 1183 | netxen_handle_int(adapter); | ||
| 1184 | return IRQ_HANDLED; | ||
| 1185 | } | ||
| 1186 | |||
| 1275 | static int netxen_nic_poll(struct napi_struct *napi, int budget) | 1187 | static int netxen_nic_poll(struct napi_struct *napi, int budget) |
| 1276 | { | 1188 | { |
| 1277 | struct netxen_adapter *adapter = container_of(napi, struct netxen_adapter, napi); | 1189 | struct netxen_adapter *adapter = container_of(napi, struct netxen_adapter, napi); |
| 1278 | struct net_device *netdev = adapter->netdev; | 1190 | int tx_complete; |
| 1279 | int done = 1; | ||
| 1280 | int ctx; | 1191 | int ctx; |
| 1281 | int work_done; | 1192 | int work_done; |
| 1282 | 1193 | ||
| 1283 | DPRINTK(INFO, "polling for %d descriptors\n", *budget); | 1194 | tx_complete = netxen_process_cmd_ring(adapter); |
| 1284 | 1195 | ||
| 1285 | work_done = 0; | 1196 | work_done = 0; |
| 1286 | for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) { | 1197 | for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) { |
| @@ -1300,16 +1211,8 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget) | |||
| 1300 | budget / MAX_RCV_CTX); | 1211 | budget / MAX_RCV_CTX); |
| 1301 | } | 1212 | } |
| 1302 | 1213 | ||
| 1303 | if (work_done >= budget) | 1214 | if ((work_done < budget) && tx_complete) { |
| 1304 | done = 0; | 1215 | netif_rx_complete(adapter->netdev, &adapter->napi); |
| 1305 | |||
| 1306 | if (netxen_process_cmd_ring((unsigned long)adapter) == 0) | ||
| 1307 | done = 0; | ||
| 1308 | |||
| 1309 | DPRINTK(INFO, "new work_done: %d work_to_do: %d\n", | ||
| 1310 | work_done, work_to_do); | ||
| 1311 | if (done) { | ||
| 1312 | netif_rx_complete(netdev, napi); | ||
| 1313 | netxen_nic_enable_int(adapter); | 1216 | netxen_nic_enable_int(adapter); |
| 1314 | } | 1217 | } |
| 1315 | 1218 | ||
diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h index ffa3b7215ce8..a566b50f36f5 100644 --- a/drivers/net/netxen/netxen_nic_phan_reg.h +++ b/drivers/net/netxen/netxen_nic_phan_reg.h | |||
| @@ -126,8 +126,11 @@ | |||
| 126 | */ | 126 | */ |
| 127 | #define CRB_NIC_CAPABILITIES_HOST NETXEN_NIC_REG(0x1a8) | 127 | #define CRB_NIC_CAPABILITIES_HOST NETXEN_NIC_REG(0x1a8) |
| 128 | #define CRB_NIC_CAPABILITIES_FW NETXEN_NIC_REG(0x1dc) | 128 | #define CRB_NIC_CAPABILITIES_FW NETXEN_NIC_REG(0x1dc) |
| 129 | #define CRB_NIC_MSI_MODE_HOST NETXEN_NIC_REG(0x270) | ||
| 130 | #define CRB_NIC_MSI_MODE_FW NETXEN_NIC_REG(0x274) | ||
| 129 | 131 | ||
| 130 | #define INTR_SCHEME_PERPORT 0x1 | 132 | #define INTR_SCHEME_PERPORT 0x1 |
| 133 | #define MSI_MODE_MULTIFUNC 0x1 | ||
| 131 | 134 | ||
| 132 | /* used for ethtool tests */ | 135 | /* used for ethtool tests */ |
| 133 | #define CRB_SCRATCHPAD_TEST NETXEN_NIC_REG(0x280) | 136 | #define CRB_SCRATCHPAD_TEST NETXEN_NIC_REG(0x280) |
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index f0574073a2a3..33539917e9b8 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
| @@ -58,9 +58,25 @@ | |||
| 58 | #define MII_M1111_RX_DELAY 0x80 | 58 | #define MII_M1111_RX_DELAY 0x80 |
| 59 | #define MII_M1111_TX_DELAY 0x2 | 59 | #define MII_M1111_TX_DELAY 0x2 |
| 60 | #define MII_M1111_PHY_EXT_SR 0x1b | 60 | #define MII_M1111_PHY_EXT_SR 0x1b |
| 61 | #define MII_M1111_HWCFG_MODE_MASK 0xf | 61 | |
| 62 | #define MII_M1111_HWCFG_MODE_RGMII 0xb | 62 | #define MII_M1111_HWCFG_MODE_MASK 0xf |
| 63 | #define MII_M1111_HWCFG_MODE_COPPER_RGMII 0xb | ||
| 64 | #define MII_M1111_HWCFG_MODE_FIBER_RGMII 0x3 | ||
| 63 | #define MII_M1111_HWCFG_MODE_SGMII_NO_CLK 0x4 | 65 | #define MII_M1111_HWCFG_MODE_SGMII_NO_CLK 0x4 |
| 66 | #define MII_M1111_HWCFG_FIBER_COPPER_AUTO 0x8000 | ||
| 67 | #define MII_M1111_HWCFG_FIBER_COPPER_RES 0x2000 | ||
| 68 | |||
| 69 | #define MII_M1111_COPPER 0 | ||
| 70 | #define MII_M1111_FIBER 1 | ||
| 71 | |||
| 72 | #define MII_M1011_PHY_STATUS 0x11 | ||
| 73 | #define MII_M1011_PHY_STATUS_1000 0x8000 | ||
| 74 | #define MII_M1011_PHY_STATUS_100 0x4000 | ||
| 75 | #define MII_M1011_PHY_STATUS_SPD_MASK 0xc000 | ||
| 76 | #define MII_M1011_PHY_STATUS_FULLDUPLEX 0x2000 | ||
| 77 | #define MII_M1011_PHY_STATUS_RESOLVED 0x0800 | ||
| 78 | #define MII_M1011_PHY_STATUS_LINK 0x0400 | ||
| 79 | |||
| 64 | 80 | ||
| 65 | MODULE_DESCRIPTION("Marvell PHY driver"); | 81 | MODULE_DESCRIPTION("Marvell PHY driver"); |
| 66 | MODULE_AUTHOR("Andy Fleming"); | 82 | MODULE_AUTHOR("Andy Fleming"); |
| @@ -141,12 +157,22 @@ static int marvell_config_aneg(struct phy_device *phydev) | |||
| 141 | static int m88e1111_config_init(struct phy_device *phydev) | 157 | static int m88e1111_config_init(struct phy_device *phydev) |
| 142 | { | 158 | { |
| 143 | int err; | 159 | int err; |
| 160 | int temp; | ||
| 161 | int mode; | ||
| 162 | |||
| 163 | /* Enable Fiber/Copper auto selection */ | ||
| 164 | temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); | ||
| 165 | temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO; | ||
| 166 | phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); | ||
| 167 | |||
| 168 | temp = phy_read(phydev, MII_BMCR); | ||
| 169 | temp |= BMCR_RESET; | ||
| 170 | phy_write(phydev, MII_BMCR, temp); | ||
| 144 | 171 | ||
| 145 | if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) || | 172 | if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) || |
| 146 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) || | 173 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) || |
| 147 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) || | 174 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) || |
| 148 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) { | 175 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) { |
| 149 | int temp; | ||
| 150 | 176 | ||
| 151 | temp = phy_read(phydev, MII_M1111_PHY_EXT_CR); | 177 | temp = phy_read(phydev, MII_M1111_PHY_EXT_CR); |
| 152 | if (temp < 0) | 178 | if (temp < 0) |
| @@ -171,7 +197,13 @@ static int m88e1111_config_init(struct phy_device *phydev) | |||
| 171 | return temp; | 197 | return temp; |
| 172 | 198 | ||
| 173 | temp &= ~(MII_M1111_HWCFG_MODE_MASK); | 199 | temp &= ~(MII_M1111_HWCFG_MODE_MASK); |
| 174 | temp |= MII_M1111_HWCFG_MODE_RGMII; | 200 | |
| 201 | mode = phy_read(phydev, MII_M1111_PHY_EXT_CR); | ||
| 202 | |||
| 203 | if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES) | ||
| 204 | temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII; | ||
| 205 | else | ||
| 206 | temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII; | ||
| 175 | 207 | ||
| 176 | err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); | 208 | err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); |
| 177 | if (err < 0) | 209 | if (err < 0) |
| @@ -262,6 +294,93 @@ static int m88e1145_config_init(struct phy_device *phydev) | |||
| 262 | return 0; | 294 | return 0; |
| 263 | } | 295 | } |
| 264 | 296 | ||
| 297 | /* marvell_read_status | ||
| 298 | * | ||
| 299 | * Generic status code does not detect Fiber correctly! | ||
| 300 | * Description: | ||
| 301 | * Check the link, then figure out the current state | ||
| 302 | * by comparing what we advertise with what the link partner | ||
| 303 | * advertises. Start by checking the gigabit possibilities, | ||
| 304 | * then move on to 10/100. | ||
| 305 | */ | ||
| 306 | static int marvell_read_status(struct phy_device *phydev) | ||
| 307 | { | ||
| 308 | int adv; | ||
| 309 | int err; | ||
| 310 | int lpa; | ||
| 311 | int status = 0; | ||
| 312 | |||
| 313 | /* Update the link, but return if there | ||
| 314 | * was an error */ | ||
| 315 | err = genphy_update_link(phydev); | ||
| 316 | if (err) | ||
| 317 | return err; | ||
| 318 | |||
| 319 | if (AUTONEG_ENABLE == phydev->autoneg) { | ||
| 320 | status = phy_read(phydev, MII_M1011_PHY_STATUS); | ||
| 321 | if (status < 0) | ||
| 322 | return status; | ||
| 323 | |||
| 324 | lpa = phy_read(phydev, MII_LPA); | ||
| 325 | if (lpa < 0) | ||
| 326 | return lpa; | ||
| 327 | |||
| 328 | adv = phy_read(phydev, MII_ADVERTISE); | ||
| 329 | if (adv < 0) | ||
| 330 | return adv; | ||
| 331 | |||
| 332 | lpa &= adv; | ||
| 333 | |||
| 334 | if (status & MII_M1011_PHY_STATUS_FULLDUPLEX) | ||
| 335 | phydev->duplex = DUPLEX_FULL; | ||
| 336 | else | ||
| 337 | phydev->duplex = DUPLEX_HALF; | ||
| 338 | |||
| 339 | status = status & MII_M1011_PHY_STATUS_SPD_MASK; | ||
| 340 | phydev->pause = phydev->asym_pause = 0; | ||
| 341 | |||
| 342 | switch (status) { | ||
| 343 | case MII_M1011_PHY_STATUS_1000: | ||
| 344 | phydev->speed = SPEED_1000; | ||
| 345 | break; | ||
| 346 | |||
| 347 | case MII_M1011_PHY_STATUS_100: | ||
| 348 | phydev->speed = SPEED_100; | ||
| 349 | break; | ||
| 350 | |||
| 351 | default: | ||
| 352 | phydev->speed = SPEED_10; | ||
| 353 | break; | ||
| 354 | } | ||
| 355 | |||
| 356 | if (phydev->duplex == DUPLEX_FULL) { | ||
| 357 | phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0; | ||
| 358 | phydev->asym_pause = lpa & LPA_PAUSE_ASYM ? 1 : 0; | ||
| 359 | } | ||
| 360 | } else { | ||
| 361 | int bmcr = phy_read(phydev, MII_BMCR); | ||
| 362 | |||
| 363 | if (bmcr < 0) | ||
| 364 | return bmcr; | ||
| 365 | |||
| 366 | if (bmcr & BMCR_FULLDPLX) | ||
| 367 | phydev->duplex = DUPLEX_FULL; | ||
| 368 | else | ||
| 369 | phydev->duplex = DUPLEX_HALF; | ||
| 370 | |||
| 371 | if (bmcr & BMCR_SPEED1000) | ||
| 372 | phydev->speed = SPEED_1000; | ||
| 373 | else if (bmcr & BMCR_SPEED100) | ||
| 374 | phydev->speed = SPEED_100; | ||
| 375 | else | ||
| 376 | phydev->speed = SPEED_10; | ||
| 377 | |||
| 378 | phydev->pause = phydev->asym_pause = 0; | ||
| 379 | } | ||
| 380 | |||
| 381 | return 0; | ||
| 382 | } | ||
| 383 | |||
| 265 | static struct phy_driver marvell_drivers[] = { | 384 | static struct phy_driver marvell_drivers[] = { |
| 266 | { | 385 | { |
| 267 | .phy_id = 0x01410c60, | 386 | .phy_id = 0x01410c60, |
| @@ -296,7 +415,7 @@ static struct phy_driver marvell_drivers[] = { | |||
| 296 | .flags = PHY_HAS_INTERRUPT, | 415 | .flags = PHY_HAS_INTERRUPT, |
| 297 | .config_init = &m88e1111_config_init, | 416 | .config_init = &m88e1111_config_init, |
| 298 | .config_aneg = &marvell_config_aneg, | 417 | .config_aneg = &marvell_config_aneg, |
| 299 | .read_status = &genphy_read_status, | 418 | .read_status = &marvell_read_status, |
| 300 | .ack_interrupt = &marvell_ack_interrupt, | 419 | .ack_interrupt = &marvell_ack_interrupt, |
| 301 | .config_intr = &marvell_config_intr, | 420 | .config_intr = &marvell_config_intr, |
| 302 | .driver = { .owner = THIS_MODULE }, | 421 | .driver = { .owner = THIS_MODULE }, |
diff --git a/drivers/net/plip.c b/drivers/net/plip.c index fee3d7b1feba..1e965427b0e9 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c | |||
| @@ -903,17 +903,18 @@ plip_interrupt(void *dev_id) | |||
| 903 | struct net_local *nl; | 903 | struct net_local *nl; |
| 904 | struct plip_local *rcv; | 904 | struct plip_local *rcv; |
| 905 | unsigned char c0; | 905 | unsigned char c0; |
| 906 | unsigned long flags; | ||
| 906 | 907 | ||
| 907 | nl = netdev_priv(dev); | 908 | nl = netdev_priv(dev); |
| 908 | rcv = &nl->rcv_data; | 909 | rcv = &nl->rcv_data; |
| 909 | 910 | ||
| 910 | spin_lock_irq (&nl->lock); | 911 | spin_lock_irqsave (&nl->lock, flags); |
| 911 | 912 | ||
| 912 | c0 = read_status(dev); | 913 | c0 = read_status(dev); |
| 913 | if ((c0 & 0xf8) != 0xc0) { | 914 | if ((c0 & 0xf8) != 0xc0) { |
| 914 | if ((dev->irq != -1) && (net_debug > 1)) | 915 | if ((dev->irq != -1) && (net_debug > 1)) |
| 915 | printk(KERN_DEBUG "%s: spurious interrupt\n", dev->name); | 916 | printk(KERN_DEBUG "%s: spurious interrupt\n", dev->name); |
| 916 | spin_unlock_irq (&nl->lock); | 917 | spin_unlock_irqrestore (&nl->lock, flags); |
| 917 | return; | 918 | return; |
| 918 | } | 919 | } |
| 919 | 920 | ||
| @@ -942,7 +943,7 @@ plip_interrupt(void *dev_id) | |||
| 942 | break; | 943 | break; |
| 943 | } | 944 | } |
| 944 | 945 | ||
| 945 | spin_unlock_irq(&nl->lock); | 946 | spin_unlock_irqrestore(&nl->lock, flags); |
| 946 | } | 947 | } |
| 947 | 948 | ||
| 948 | static int | 949 | static int |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index c72787adeba3..3c915b82e199 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -4172,6 +4172,9 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 4172 | dev->trans_start = jiffies; | 4172 | dev->trans_start = jiffies; |
| 4173 | spin_unlock_irqrestore(&fifo->tx_lock, flags); | 4173 | spin_unlock_irqrestore(&fifo->tx_lock, flags); |
| 4174 | 4174 | ||
| 4175 | if (sp->config.intr_type == MSI_X) | ||
| 4176 | tx_intr_handler(fifo); | ||
| 4177 | |||
| 4175 | return 0; | 4178 | return 0; |
| 4176 | pci_map_failed: | 4179 | pci_map_failed: |
| 4177 | stats->pci_map_fail_cnt++; | 4180 | stats->pci_map_fail_cnt++; |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 186eb8ebfda6..2e26dced13a1 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
| @@ -3199,12 +3199,14 @@ static int skge_poll(struct napi_struct *napi, int to_do) | |||
| 3199 | skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START); | 3199 | skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START); |
| 3200 | 3200 | ||
| 3201 | if (work_done < to_do) { | 3201 | if (work_done < to_do) { |
| 3202 | spin_lock_irq(&hw->hw_lock); | 3202 | unsigned long flags; |
| 3203 | |||
| 3204 | spin_lock_irqsave(&hw->hw_lock, flags); | ||
| 3203 | __netif_rx_complete(dev, napi); | 3205 | __netif_rx_complete(dev, napi); |
| 3204 | hw->intr_mask |= napimask[skge->port]; | 3206 | hw->intr_mask |= napimask[skge->port]; |
| 3205 | skge_write32(hw, B0_IMSK, hw->intr_mask); | 3207 | skge_write32(hw, B0_IMSK, hw->intr_mask); |
| 3206 | skge_read32(hw, B0_IMSK); | 3208 | skge_read32(hw, B0_IMSK); |
| 3207 | spin_unlock_irq(&hw->hw_lock); | 3209 | spin_unlock_irqrestore(&hw->hw_lock, flags); |
| 3208 | } | 3210 | } |
| 3209 | 3211 | ||
| 3210 | return work_done; | 3212 | return work_done; |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 51d4134b37b1..98a832a75539 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -92,14 +92,14 @@ | |||
| 92 | #define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l) | 92 | #define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l) |
| 93 | # endif | 93 | # endif |
| 94 | /* check if the mac in reg is valid */ | 94 | /* check if the mac in reg is valid */ |
| 95 | #define SMC_GET_MAC_ADDR(addr) \ | 95 | #define SMC_GET_MAC_ADDR(lp, addr) \ |
| 96 | do { \ | 96 | do { \ |
| 97 | unsigned int __v; \ | 97 | unsigned int __v; \ |
| 98 | __v = SMC_inw(ioaddr, ADDR0_REG); \ | 98 | __v = SMC_inw(ioaddr, ADDR0_REG(lp)); \ |
| 99 | addr[0] = __v; addr[1] = __v >> 8; \ | 99 | addr[0] = __v; addr[1] = __v >> 8; \ |
| 100 | __v = SMC_inw(ioaddr, ADDR1_REG); \ | 100 | __v = SMC_inw(ioaddr, ADDR1_REG(lp)); \ |
| 101 | addr[2] = __v; addr[3] = __v >> 8; \ | 101 | addr[2] = __v; addr[3] = __v >> 8; \ |
| 102 | __v = SMC_inw(ioaddr, ADDR2_REG); \ | 102 | __v = SMC_inw(ioaddr, ADDR2_REG(lp)); \ |
| 103 | addr[4] = __v; addr[5] = __v >> 8; \ | 103 | addr[4] = __v; addr[5] = __v >> 8; \ |
| 104 | if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \ | 104 | if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \ |
| 105 | random_ether_addr(addr); \ | 105 | random_ether_addr(addr); \ |
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 8909050b8ea7..5f1c5072b96f 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
| @@ -3413,7 +3413,7 @@ static int smctr_make_tx_status_code(struct net_device *dev, | |||
| 3413 | tsv->svi = TRANSMIT_STATUS_CODE; | 3413 | tsv->svi = TRANSMIT_STATUS_CODE; |
| 3414 | tsv->svl = S_TRANSMIT_STATUS_CODE; | 3414 | tsv->svl = S_TRANSMIT_STATUS_CODE; |
| 3415 | 3415 | ||
| 3416 | tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) || IBM_PASS_SOURCE_ADDR); | 3416 | tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) | IBM_PASS_SOURCE_ADDR); |
| 3417 | 3417 | ||
| 3418 | /* Stripped frame status of Transmitted Frame */ | 3418 | /* Stripped frame status of Transmitted Frame */ |
| 3419 | tsv->svv[1] = tx_fstatus & 0xff; | 3419 | tsv->svv[1] = tx_fstatus & 0xff; |
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 4b131a6c6b70..0343b00cf1fd 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c | |||
| @@ -341,7 +341,7 @@ static void dm9601_set_multicast(struct net_device *net) | |||
| 341 | /* We use the 20 byte dev->data for our 8 byte filter buffer | 341 | /* We use the 20 byte dev->data for our 8 byte filter buffer |
| 342 | * to avoid allocating memory that is tricky to free later */ | 342 | * to avoid allocating memory that is tricky to free later */ |
| 343 | u8 *hashes = (u8 *) & dev->data; | 343 | u8 *hashes = (u8 *) & dev->data; |
| 344 | u8 rx_ctl = 0x01; | 344 | u8 rx_ctl = 0x31; |
| 345 | 345 | ||
| 346 | memset(hashes, 0x00, DM_MCAST_SIZE); | 346 | memset(hashes, 0x00, DM_MCAST_SIZE); |
| 347 | hashes[DM_MCAST_SIZE - 1] |= 0x80; /* broadcast address */ | 347 | hashes[DM_MCAST_SIZE - 1] |= 0x80; /* broadcast address */ |
| @@ -562,6 +562,10 @@ static const struct usb_device_id products[] = { | |||
| 562 | USB_DEVICE(0x0a46, 0x8515), /* ADMtek ADM8515 USB NIC */ | 562 | USB_DEVICE(0x0a46, 0x8515), /* ADMtek ADM8515 USB NIC */ |
| 563 | .driver_info = (unsigned long)&dm9601_info, | 563 | .driver_info = (unsigned long)&dm9601_info, |
| 564 | }, | 564 | }, |
| 565 | { | ||
| 566 | USB_DEVICE(0x0a47, 0x9601), /* Hirose USB-100 */ | ||
| 567 | .driver_info = (unsigned long)&dm9601_info, | ||
| 568 | }, | ||
| 565 | {}, // END | 569 | {}, // END |
| 566 | }; | 570 | }; |
| 567 | 571 | ||
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 727547a28992..369c731114b3 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
| @@ -283,7 +283,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
| 283 | struct rndis_set_c *set_c; | 283 | struct rndis_set_c *set_c; |
| 284 | struct rndis_halt *halt; | 284 | struct rndis_halt *halt; |
| 285 | } u; | 285 | } u; |
| 286 | u32 tmp, *phym; | 286 | u32 tmp, phym_unspec, *phym; |
| 287 | int reply_len; | 287 | int reply_len; |
| 288 | unsigned char *bp; | 288 | unsigned char *bp; |
| 289 | 289 | ||
| @@ -363,12 +363,15 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
| 363 | goto halt_fail_and_release; | 363 | goto halt_fail_and_release; |
| 364 | 364 | ||
| 365 | /* Check physical medium */ | 365 | /* Check physical medium */ |
| 366 | phym = NULL; | ||
| 366 | reply_len = sizeof *phym; | 367 | reply_len = sizeof *phym; |
| 367 | retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM, | 368 | retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM, |
| 368 | 0, (void **) &phym, &reply_len); | 369 | 0, (void **) &phym, &reply_len); |
| 369 | if (retval != 0) | 370 | if (retval != 0 || !phym) { |
| 370 | /* OID is optional so don't fail here. */ | 371 | /* OID is optional so don't fail here. */ |
| 371 | *phym = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED; | 372 | phym_unspec = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED; |
| 373 | phym = &phym_unspec; | ||
| 374 | } | ||
| 372 | if ((flags & FLAG_RNDIS_PHYM_WIRELESS) && | 375 | if ((flags & FLAG_RNDIS_PHYM_WIRELESS) && |
| 373 | *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) { | 376 | *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) { |
| 374 | if (netif_msg_probe(dev)) | 377 | if (netif_msg_probe(dev)) |
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c index c6e70dbc5de8..2ab1d59870f4 100644 --- a/drivers/net/wireless/arlan-proc.c +++ b/drivers/net/wireless/arlan-proc.c | |||
| @@ -1202,13 +1202,6 @@ static ctl_table arlan_table[MAX_ARLANS + 1] = | |||
| 1202 | { .ctl_name = 0 } | 1202 | { .ctl_name = 0 } |
| 1203 | }; | 1203 | }; |
| 1204 | #endif | 1204 | #endif |
| 1205 | #else | ||
| 1206 | |||
| 1207 | static ctl_table arlan_table[MAX_ARLANS + 1] = | ||
| 1208 | { | ||
| 1209 | { .ctl_name = 0 } | ||
| 1210 | }; | ||
| 1211 | #endif | ||
| 1212 | 1205 | ||
| 1213 | 1206 | ||
| 1214 | // static int mmtu = 1234; | 1207 | // static int mmtu = 1234; |
| @@ -1233,7 +1226,6 @@ static ctl_table arlan_root_table[] = | |||
| 1233 | //}; | 1226 | //}; |
| 1234 | 1227 | ||
| 1235 | 1228 | ||
| 1236 | #ifdef CONFIG_PROC_FS | ||
| 1237 | static struct ctl_table_header *arlan_device_sysctl_header; | 1229 | static struct ctl_table_header *arlan_device_sysctl_header; |
| 1238 | 1230 | ||
| 1239 | int __init init_arlan_proc(void) | 1231 | int __init init_arlan_proc(void) |
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c index e38ed0fe72e9..7fca2ebc747f 100644 --- a/drivers/net/wireless/b43/debugfs.c +++ b/drivers/net/wireless/b43/debugfs.c | |||
| @@ -618,6 +618,7 @@ void b43_debugfs_remove_device(struct b43_wldev *dev) | |||
| 618 | kfree(e); | 618 | kfree(e); |
| 619 | } | 619 | } |
| 620 | 620 | ||
| 621 | /* Called with IRQs disabled. */ | ||
| 621 | void b43_debugfs_log_txstat(struct b43_wldev *dev, | 622 | void b43_debugfs_log_txstat(struct b43_wldev *dev, |
| 622 | const struct b43_txstatus *status) | 623 | const struct b43_txstatus *status) |
| 623 | { | 624 | { |
| @@ -629,8 +630,7 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev, | |||
| 629 | if (!e) | 630 | if (!e) |
| 630 | return; | 631 | return; |
| 631 | log = &e->txstatlog; | 632 | log = &e->txstatlog; |
| 632 | B43_WARN_ON(!irqs_disabled()); | 633 | spin_lock(&log->lock); /* IRQs are already disabled. */ |
| 633 | spin_lock(&log->lock); | ||
| 634 | i = log->end + 1; | 634 | i = log->end + 1; |
| 635 | if (i == B43_NR_LOGGED_TXSTATUS) | 635 | if (i == B43_NR_LOGGED_TXSTATUS) |
| 636 | i = 0; | 636 | i = 0; |
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 3dfb28a34be9..cfbc1a26f601 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
| @@ -560,7 +560,7 @@ static int b43_dmacontroller_tx_reset(struct b43_wldev *dev, u16 mmio_base, | |||
| 560 | /* Check if a DMA mapping address is invalid. */ | 560 | /* Check if a DMA mapping address is invalid. */ |
| 561 | static bool b43_dma_mapping_error(struct b43_dmaring *ring, | 561 | static bool b43_dma_mapping_error(struct b43_dmaring *ring, |
| 562 | dma_addr_t addr, | 562 | dma_addr_t addr, |
| 563 | size_t buffersize) | 563 | size_t buffersize, bool dma_to_device) |
| 564 | { | 564 | { |
| 565 | if (unlikely(dma_mapping_error(addr))) | 565 | if (unlikely(dma_mapping_error(addr))) |
| 566 | return 1; | 566 | return 1; |
| @@ -568,11 +568,11 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring, | |||
| 568 | switch (ring->type) { | 568 | switch (ring->type) { |
| 569 | case B43_DMA_30BIT: | 569 | case B43_DMA_30BIT: |
| 570 | if ((u64)addr + buffersize > (1ULL << 30)) | 570 | if ((u64)addr + buffersize > (1ULL << 30)) |
| 571 | return 1; | 571 | goto address_error; |
| 572 | break; | 572 | break; |
| 573 | case B43_DMA_32BIT: | 573 | case B43_DMA_32BIT: |
| 574 | if ((u64)addr + buffersize > (1ULL << 32)) | 574 | if ((u64)addr + buffersize > (1ULL << 32)) |
| 575 | return 1; | 575 | goto address_error; |
| 576 | break; | 576 | break; |
| 577 | case B43_DMA_64BIT: | 577 | case B43_DMA_64BIT: |
| 578 | /* Currently we can't have addresses beyond | 578 | /* Currently we can't have addresses beyond |
| @@ -582,6 +582,12 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring, | |||
| 582 | 582 | ||
| 583 | /* The address is OK. */ | 583 | /* The address is OK. */ |
| 584 | return 0; | 584 | return 0; |
| 585 | |||
| 586 | address_error: | ||
| 587 | /* We can't support this address. Unmap it again. */ | ||
| 588 | unmap_descbuffer(ring, addr, buffersize, dma_to_device); | ||
| 589 | |||
| 590 | return 1; | ||
| 585 | } | 591 | } |
| 586 | 592 | ||
| 587 | static int setup_rx_descbuffer(struct b43_dmaring *ring, | 593 | static int setup_rx_descbuffer(struct b43_dmaring *ring, |
| @@ -599,7 +605,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring, | |||
| 599 | if (unlikely(!skb)) | 605 | if (unlikely(!skb)) |
| 600 | return -ENOMEM; | 606 | return -ENOMEM; |
| 601 | dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0); | 607 | dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0); |
| 602 | if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize)) { | 608 | if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) { |
| 603 | /* ugh. try to realloc in zone_dma */ | 609 | /* ugh. try to realloc in zone_dma */ |
| 604 | gfp_flags |= GFP_DMA; | 610 | gfp_flags |= GFP_DMA; |
| 605 | 611 | ||
| @@ -612,7 +618,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring, | |||
| 612 | ring->rx_buffersize, 0); | 618 | ring->rx_buffersize, 0); |
| 613 | } | 619 | } |
| 614 | 620 | ||
| 615 | if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize)) { | 621 | if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) { |
| 616 | dev_kfree_skb_any(skb); | 622 | dev_kfree_skb_any(skb); |
| 617 | return -EIO; | 623 | return -EIO; |
| 618 | } | 624 | } |
| @@ -852,7 +858,8 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, | |||
| 852 | b43_txhdr_size(dev), | 858 | b43_txhdr_size(dev), |
| 853 | DMA_TO_DEVICE); | 859 | DMA_TO_DEVICE); |
| 854 | 860 | ||
| 855 | if (b43_dma_mapping_error(ring, dma_test, b43_txhdr_size(dev))) { | 861 | if (b43_dma_mapping_error(ring, dma_test, |
| 862 | b43_txhdr_size(dev), 1)) { | ||
| 856 | /* ugh realloc */ | 863 | /* ugh realloc */ |
| 857 | kfree(ring->txhdr_cache); | 864 | kfree(ring->txhdr_cache); |
| 858 | ring->txhdr_cache = kcalloc(nr_slots, | 865 | ring->txhdr_cache = kcalloc(nr_slots, |
| @@ -867,7 +874,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, | |||
| 867 | DMA_TO_DEVICE); | 874 | DMA_TO_DEVICE); |
| 868 | 875 | ||
| 869 | if (b43_dma_mapping_error(ring, dma_test, | 876 | if (b43_dma_mapping_error(ring, dma_test, |
| 870 | b43_txhdr_size(dev))) | 877 | b43_txhdr_size(dev), 1)) |
| 871 | goto err_kfree_txhdr_cache; | 878 | goto err_kfree_txhdr_cache; |
| 872 | } | 879 | } |
| 873 | 880 | ||
| @@ -1189,7 +1196,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring, | |||
| 1189 | 1196 | ||
| 1190 | meta_hdr->dmaaddr = map_descbuffer(ring, (unsigned char *)header, | 1197 | meta_hdr->dmaaddr = map_descbuffer(ring, (unsigned char *)header, |
| 1191 | hdrsize, 1); | 1198 | hdrsize, 1); |
| 1192 | if (b43_dma_mapping_error(ring, meta_hdr->dmaaddr, hdrsize)) { | 1199 | if (b43_dma_mapping_error(ring, meta_hdr->dmaaddr, hdrsize, 1)) { |
| 1193 | ring->current_slot = old_top_slot; | 1200 | ring->current_slot = old_top_slot; |
| 1194 | ring->used_slots = old_used_slots; | 1201 | ring->used_slots = old_used_slots; |
| 1195 | return -EIO; | 1202 | return -EIO; |
| @@ -1208,7 +1215,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring, | |||
| 1208 | 1215 | ||
| 1209 | meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); | 1216 | meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); |
| 1210 | /* create a bounce buffer in zone_dma on mapping failure. */ | 1217 | /* create a bounce buffer in zone_dma on mapping failure. */ |
| 1211 | if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len)) { | 1218 | if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) { |
| 1212 | bounce_skb = __dev_alloc_skb(skb->len, GFP_ATOMIC | GFP_DMA); | 1219 | bounce_skb = __dev_alloc_skb(skb->len, GFP_ATOMIC | GFP_DMA); |
| 1213 | if (!bounce_skb) { | 1220 | if (!bounce_skb) { |
| 1214 | ring->current_slot = old_top_slot; | 1221 | ring->current_slot = old_top_slot; |
| @@ -1222,7 +1229,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring, | |||
| 1222 | skb = bounce_skb; | 1229 | skb = bounce_skb; |
| 1223 | meta->skb = skb; | 1230 | meta->skb = skb; |
| 1224 | meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); | 1231 | meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); |
| 1225 | if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len)) { | 1232 | if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) { |
| 1226 | ring->current_slot = old_top_slot; | 1233 | ring->current_slot = old_top_slot; |
| 1227 | ring->used_slots = old_used_slots; | 1234 | ring->used_slots = old_used_slots; |
| 1228 | err = -EIO; | 1235 | err = -EIO; |
| @@ -1337,6 +1344,7 @@ out_unlock: | |||
| 1337 | return err; | 1344 | return err; |
| 1338 | } | 1345 | } |
| 1339 | 1346 | ||
| 1347 | /* Called with IRQs disabled. */ | ||
| 1340 | void b43_dma_handle_txstatus(struct b43_wldev *dev, | 1348 | void b43_dma_handle_txstatus(struct b43_wldev *dev, |
| 1341 | const struct b43_txstatus *status) | 1349 | const struct b43_txstatus *status) |
| 1342 | { | 1350 | { |
| @@ -1349,8 +1357,8 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev, | |||
| 1349 | ring = parse_cookie(dev, status->cookie, &slot); | 1357 | ring = parse_cookie(dev, status->cookie, &slot); |
| 1350 | if (unlikely(!ring)) | 1358 | if (unlikely(!ring)) |
| 1351 | return; | 1359 | return; |
| 1352 | B43_WARN_ON(!irqs_disabled()); | 1360 | |
| 1353 | spin_lock(&ring->lock); | 1361 | spin_lock(&ring->lock); /* IRQs are already disabled. */ |
| 1354 | 1362 | ||
| 1355 | B43_WARN_ON(!ring->tx); | 1363 | B43_WARN_ON(!ring->tx); |
| 1356 | ops = ring->ops; | 1364 | ops = ring->ops; |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 51dfce16178a..c73a75b24cd6 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
| @@ -2049,7 +2049,6 @@ void b43_mac_enable(struct b43_wldev *dev) | |||
| 2049 | { | 2049 | { |
| 2050 | dev->mac_suspended--; | 2050 | dev->mac_suspended--; |
| 2051 | B43_WARN_ON(dev->mac_suspended < 0); | 2051 | B43_WARN_ON(dev->mac_suspended < 0); |
| 2052 | B43_WARN_ON(irqs_disabled()); | ||
| 2053 | if (dev->mac_suspended == 0) { | 2052 | if (dev->mac_suspended == 0) { |
| 2054 | b43_write32(dev, B43_MMIO_MACCTL, | 2053 | b43_write32(dev, B43_MMIO_MACCTL, |
| 2055 | b43_read32(dev, B43_MMIO_MACCTL) | 2054 | b43_read32(dev, B43_MMIO_MACCTL) |
| @@ -2075,7 +2074,6 @@ void b43_mac_suspend(struct b43_wldev *dev) | |||
| 2075 | u32 tmp; | 2074 | u32 tmp; |
| 2076 | 2075 | ||
| 2077 | might_sleep(); | 2076 | might_sleep(); |
| 2078 | B43_WARN_ON(irqs_disabled()); | ||
| 2079 | B43_WARN_ON(dev->mac_suspended < 0); | 2077 | B43_WARN_ON(dev->mac_suspended < 0); |
| 2080 | 2078 | ||
| 2081 | if (dev->mac_suspended == 0) { | 2079 | if (dev->mac_suspended == 0) { |
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index d1af938b9aa6..b79a35a40ab6 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
| @@ -20,7 +20,7 @@ config IWL4965 | |||
| 20 | runs. | 20 | runs. |
| 21 | 21 | ||
| 22 | If you want to compile the driver as a module ( = code which can be | 22 | If you want to compile the driver as a module ( = code which can be |
| 23 | inserted in and remvoed from the running kernel whenever you want), | 23 | inserted in and removed from the running kernel whenever you want), |
| 24 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 24 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
| 25 | module will be called iwl4965.ko. | 25 | module will be called iwl4965.ko. |
| 26 | 26 | ||
| @@ -101,7 +101,7 @@ config IWL3945 | |||
| 101 | runs. | 101 | runs. |
| 102 | 102 | ||
| 103 | If you want to compile the driver as a module ( = code which can be | 103 | If you want to compile the driver as a module ( = code which can be |
| 104 | inserted in and remvoed from the running kernel whenever you want), | 104 | inserted in and removed from the running kernel whenever you want), |
| 105 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 105 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
| 106 | module will be called iwl3945.ko. | 106 | module will be called iwl3945.ko. |
| 107 | 107 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 40b71bc2c4a4..cbaeaf186494 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -6206,11 +6206,11 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv) | |||
| 6206 | 6206 | ||
| 6207 | /* At this point, the NIC is initialized and operational */ | 6207 | /* At this point, the NIC is initialized and operational */ |
| 6208 | priv->notif_missed_beacons = 0; | 6208 | priv->notif_missed_beacons = 0; |
| 6209 | set_bit(STATUS_READY, &priv->status); | ||
| 6210 | 6209 | ||
| 6211 | iwl3945_reg_txpower_periodic(priv); | 6210 | iwl3945_reg_txpower_periodic(priv); |
| 6212 | 6211 | ||
| 6213 | IWL_DEBUG_INFO("ALIVE processing complete.\n"); | 6212 | IWL_DEBUG_INFO("ALIVE processing complete.\n"); |
| 6213 | set_bit(STATUS_READY, &priv->status); | ||
| 6214 | wake_up_interruptible(&priv->wait_command_queue); | 6214 | wake_up_interruptible(&priv->wait_command_queue); |
| 6215 | 6215 | ||
| 6216 | if (priv->error_recovering) | 6216 | if (priv->error_recovering) |
| @@ -8706,7 +8706,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
| 8706 | return err; | 8706 | return err; |
| 8707 | } | 8707 | } |
| 8708 | 8708 | ||
| 8709 | static void iwl3945_pci_remove(struct pci_dev *pdev) | 8709 | static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) |
| 8710 | { | 8710 | { |
| 8711 | struct iwl3945_priv *priv = pci_get_drvdata(pdev); | 8711 | struct iwl3945_priv *priv = pci_get_drvdata(pdev); |
| 8712 | struct list_head *p, *q; | 8712 | struct list_head *p, *q; |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index a23d4798653b..60ec29eab85a 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
| @@ -6628,11 +6628,11 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv) | |||
| 6628 | 6628 | ||
| 6629 | /* At this point, the NIC is initialized and operational */ | 6629 | /* At this point, the NIC is initialized and operational */ |
| 6630 | priv->notif_missed_beacons = 0; | 6630 | priv->notif_missed_beacons = 0; |
| 6631 | set_bit(STATUS_READY, &priv->status); | ||
| 6632 | 6631 | ||
| 6633 | iwl4965_rf_kill_ct_config(priv); | 6632 | iwl4965_rf_kill_ct_config(priv); |
| 6634 | 6633 | ||
| 6635 | IWL_DEBUG_INFO("ALIVE processing complete.\n"); | 6634 | IWL_DEBUG_INFO("ALIVE processing complete.\n"); |
| 6635 | set_bit(STATUS_READY, &priv->status); | ||
| 6636 | wake_up_interruptible(&priv->wait_command_queue); | 6636 | wake_up_interruptible(&priv->wait_command_queue); |
| 6637 | 6637 | ||
| 6638 | if (priv->error_recovering) | 6638 | if (priv->error_recovering) |
| @@ -9282,7 +9282,7 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
| 9282 | return err; | 9282 | return err; |
| 9283 | } | 9283 | } |
| 9284 | 9284 | ||
| 9285 | static void iwl4965_pci_remove(struct pci_dev *pdev) | 9285 | static void __devexit iwl4965_pci_remove(struct pci_dev *pdev) |
| 9286 | { | 9286 | { |
| 9287 | struct iwl4965_priv *priv = pci_get_drvdata(pdev); | 9287 | struct iwl4965_priv *priv = pci_get_drvdata(pdev); |
| 9288 | struct list_head *p, *q; | 9288 | struct list_head *p, *q; |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 8103d41a1543..3909cf42f472 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -2095,6 +2095,8 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
| 2095 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, | 2095 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2096 | /* Conceptronic */ | 2096 | /* Conceptronic */ |
| 2097 | { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) }, | 2097 | { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2098 | /* Corega */ | ||
| 2099 | { USB_DEVICE(0x07aa, 0x002e), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
| 2098 | /* D-Link */ | 2100 | /* D-Link */ |
| 2099 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, | 2101 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2100 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, | 2102 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, |
diff --git a/drivers/net/wireless/wavelan_cs.h b/drivers/net/wireless/wavelan_cs.h index fabc63ee153c..2e4bfe4147c6 100644 --- a/drivers/net/wireless/wavelan_cs.h +++ b/drivers/net/wireless/wavelan_cs.h | |||
| @@ -309,7 +309,7 @@ struct mmw_t | |||
| 309 | #define MMW_EXT_ANT_INTERNAL 0x00 /* Internal antenna */ | 309 | #define MMW_EXT_ANT_INTERNAL 0x00 /* Internal antenna */ |
| 310 | #define MMW_EXT_ANT_EXTERNAL 0x03 /* External antenna */ | 310 | #define MMW_EXT_ANT_EXTERNAL 0x03 /* External antenna */ |
| 311 | #define MMW_EXT_ANT_IQ_TEST 0x1C /* IQ test pattern (set to 0) */ | 311 | #define MMW_EXT_ANT_IQ_TEST 0x1C /* IQ test pattern (set to 0) */ |
| 312 | }; | 312 | } __attribute__((packed)); |
| 313 | 313 | ||
| 314 | /* Size for structure checking (if padding is correct) */ | 314 | /* Size for structure checking (if padding is correct) */ |
| 315 | #define MMW_SIZE 37 | 315 | #define MMW_SIZE 37 |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index e9a333d98552..e887aa45c9cd 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -951,6 +951,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82375, quirk_e | |||
| 951 | * accesses to the SMBus registers, with potentially bad effects. Thus you | 951 | * accesses to the SMBus registers, with potentially bad effects. Thus you |
| 952 | * should be very careful when adding new entries: if SMM is accessing the | 952 | * should be very careful when adding new entries: if SMM is accessing the |
| 953 | * Intel SMBus, this is a very good reason to leave it hidden. | 953 | * Intel SMBus, this is a very good reason to leave it hidden. |
| 954 | * | ||
| 955 | * Likewise, many recent laptops use ACPI for thermal management. If the | ||
| 956 | * ACPI DSDT code accesses the SMBus, then Linux should not access it | ||
| 957 | * natively, and keeping the SMBus hidden is the right thing to do. If you | ||
| 958 | * are about to add an entry in the table below, please first disassemble | ||
| 959 | * the DSDT and double-check that there is no code accessing the SMBus. | ||
| 954 | */ | 960 | */ |
| 955 | static int asus_hides_smbus; | 961 | static int asus_hides_smbus; |
| 956 | 962 | ||
| @@ -1028,11 +1034,6 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev) | |||
| 1028 | case 0x12bf: /* HP xw4100 */ | 1034 | case 0x12bf: /* HP xw4100 */ |
| 1029 | asus_hides_smbus = 1; | 1035 | asus_hides_smbus = 1; |
| 1030 | } | 1036 | } |
| 1031 | else if (dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB) | ||
| 1032 | switch (dev->subsystem_device) { | ||
| 1033 | case 0x099c: /* HP Compaq nx6110 */ | ||
| 1034 | asus_hides_smbus = 1; | ||
| 1035 | } | ||
| 1036 | } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) { | 1037 | } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) { |
| 1037 | if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB) | 1038 | if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB) |
| 1038 | switch(dev->subsystem_device) { | 1039 | switch(dev->subsystem_device) { |
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 125e7b7f34ff..f7cb8e0758b4 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
| @@ -486,12 +486,7 @@ void __ref pci_bus_size_bridges(struct pci_bus *bus) | |||
| 486 | break; | 486 | break; |
| 487 | 487 | ||
| 488 | case PCI_CLASS_BRIDGE_PCI: | 488 | case PCI_CLASS_BRIDGE_PCI: |
| 489 | /* don't size subtractive decoding (transparent) | ||
| 490 | * PCI-to-PCI bridges */ | ||
| 491 | if (bus->self->transparent) | ||
| 492 | break; | ||
| 493 | pci_bridge_check_ranges(bus); | 489 | pci_bridge_check_ranges(bus); |
| 494 | /* fall through */ | ||
| 495 | default: | 490 | default: |
| 496 | pbus_size_io(bus); | 491 | pbus_size_io(bus); |
| 497 | /* If the bridge supports prefetchable range, size it | 492 | /* If the bridge supports prefetchable range, size it |
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 6aa231ef642d..2dcd1960aca8 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c | |||
| @@ -85,7 +85,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, | |||
| 85 | i < PNP_MAX_IRQ) | 85 | i < PNP_MAX_IRQ) |
| 86 | i++; | 86 | i++; |
| 87 | if (i >= PNP_MAX_IRQ && !warned) { | 87 | if (i >= PNP_MAX_IRQ && !warned) { |
| 88 | printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ " | 88 | printk(KERN_WARNING "pnpacpi: exceeded the max number of IRQ " |
| 89 | "resources: %d \n", PNP_MAX_IRQ); | 89 | "resources: %d \n", PNP_MAX_IRQ); |
| 90 | warned = 1; | 90 | warned = 1; |
| 91 | return; | 91 | return; |
| @@ -187,7 +187,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, | |||
| 187 | res->dma_resource[i].start = dma; | 187 | res->dma_resource[i].start = dma; |
| 188 | res->dma_resource[i].end = dma; | 188 | res->dma_resource[i].end = dma; |
| 189 | } else if (!warned) { | 189 | } else if (!warned) { |
| 190 | printk(KERN_ERR "pnpacpi: exceeded the max number of DMA " | 190 | printk(KERN_WARNING "pnpacpi: exceeded the max number of DMA " |
| 191 | "resources: %d \n", PNP_MAX_DMA); | 191 | "resources: %d \n", PNP_MAX_DMA); |
| 192 | warned = 1; | 192 | warned = 1; |
| 193 | } | 193 | } |
| @@ -213,7 +213,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res, | |||
| 213 | res->port_resource[i].start = io; | 213 | res->port_resource[i].start = io; |
| 214 | res->port_resource[i].end = io + len - 1; | 214 | res->port_resource[i].end = io + len - 1; |
| 215 | } else if (!warned) { | 215 | } else if (!warned) { |
| 216 | printk(KERN_ERR "pnpacpi: exceeded the max number of IO " | 216 | printk(KERN_WARNING "pnpacpi: exceeded the max number of IO " |
| 217 | "resources: %d \n", PNP_MAX_PORT); | 217 | "resources: %d \n", PNP_MAX_PORT); |
| 218 | warned = 1; | 218 | warned = 1; |
| 219 | } | 219 | } |
| @@ -241,7 +241,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res, | |||
| 241 | res->mem_resource[i].start = mem; | 241 | res->mem_resource[i].start = mem; |
| 242 | res->mem_resource[i].end = mem + len - 1; | 242 | res->mem_resource[i].end = mem + len - 1; |
| 243 | } else if (!warned) { | 243 | } else if (!warned) { |
| 244 | printk(KERN_ERR "pnpacpi: exceeded the max number of mem " | 244 | printk(KERN_WARNING "pnpacpi: exceeded the max number of mem " |
| 245 | "resources: %d\n", PNP_MAX_MEM); | 245 | "resources: %d\n", PNP_MAX_MEM); |
| 246 | warned = 1; | 246 | warned = 1; |
| 247 | } | 247 | } |
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index a8bec498cad6..f97224ce59da 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
| @@ -1214,13 +1214,6 @@ static struct pciserial_board pci_boards[] __devinitdata = { | |||
| 1214 | .base_baud = 115200, | 1214 | .base_baud = 115200, |
| 1215 | .uart_offset = 8, | 1215 | .uart_offset = 8, |
| 1216 | }, | 1216 | }, |
| 1217 | [pbn_b0_8_115200] = { | ||
| 1218 | .flags = FL_BASE0, | ||
| 1219 | .num_ports = 8, | ||
| 1220 | .base_baud = 115200, | ||
| 1221 | .uart_offset = 8, | ||
| 1222 | }, | ||
| 1223 | |||
| 1224 | [pbn_b0_1_921600] = { | 1217 | [pbn_b0_1_921600] = { |
| 1225 | .flags = FL_BASE0, | 1218 | .flags = FL_BASE0, |
| 1226 | .num_ports = 1, | 1219 | .num_ports = 1, |
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 986a550c0439..eefba3d0e4b9 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
| @@ -384,7 +384,7 @@ static int bfin_bf54x_fb_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
| 384 | * Other flags can be set, and are documented in | 384 | * Other flags can be set, and are documented in |
| 385 | * include/linux/mm.h | 385 | * include/linux/mm.h |
| 386 | */ | 386 | */ |
| 387 | vma->vm_flags |= VM_MAYSHARE; | 387 | vma->vm_flags |= VM_MAYSHARE | VM_SHARED; |
| 388 | 388 | ||
| 389 | return 0; | 389 | return 0; |
| 390 | } | 390 | } |
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index a2bb2de9e020..135d6dd7e672 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
| @@ -91,6 +91,7 @@ struct bfin_t350mcqbfb_info { | |||
| 91 | int lq043_open_cnt; | 91 | int lq043_open_cnt; |
| 92 | int irq; | 92 | int irq; |
| 93 | spinlock_t lock; /* lock */ | 93 | spinlock_t lock; /* lock */ |
| 94 | u32 pseudo_pal[16]; | ||
| 94 | }; | 95 | }; |
| 95 | 96 | ||
| 96 | static int nocursor; | 97 | static int nocursor; |
| @@ -182,13 +183,13 @@ static void bfin_t350mcqb_config_dma(struct bfin_t350mcqbfb_info *fbi) | |||
| 182 | 183 | ||
| 183 | } | 184 | } |
| 184 | 185 | ||
| 185 | static int bfin_t350mcqb_request_ports(int action) | 186 | static u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2, |
| 186 | { | ||
| 187 | u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2, | ||
| 188 | P_PPI0_D0, P_PPI0_D1, P_PPI0_D2, | 187 | P_PPI0_D0, P_PPI0_D1, P_PPI0_D2, |
| 189 | P_PPI0_D3, P_PPI0_D4, P_PPI0_D5, | 188 | P_PPI0_D3, P_PPI0_D4, P_PPI0_D5, |
| 190 | P_PPI0_D6, P_PPI0_D7, 0}; | 189 | P_PPI0_D6, P_PPI0_D7, 0}; |
| 191 | 190 | ||
| 191 | static int bfin_t350mcqb_request_ports(int action) | ||
| 192 | { | ||
| 192 | if (action) { | 193 | if (action) { |
| 193 | if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) { | 194 | if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) { |
| 194 | printk(KERN_ERR "Requesting Peripherals faild\n"); | 195 | printk(KERN_ERR "Requesting Peripherals faild\n"); |
| @@ -301,7 +302,7 @@ static int bfin_t350mcqb_fb_mmap(struct fb_info *info, struct vm_area_struct *vm | |||
| 301 | * Other flags can be set, and are documented in | 302 | * Other flags can be set, and are documented in |
| 302 | * include/linux/mm.h | 303 | * include/linux/mm.h |
| 303 | */ | 304 | */ |
| 304 | vma->vm_flags |= VM_MAYSHARE; | 305 | vma->vm_flags |= VM_MAYSHARE | VM_SHARED; |
| 305 | 306 | ||
| 306 | return 0; | 307 | return 0; |
| 307 | } | 308 | } |
| @@ -520,16 +521,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev) | |||
| 520 | 521 | ||
| 521 | fbinfo->fbops = &bfin_t350mcqb_fb_ops; | 522 | fbinfo->fbops = &bfin_t350mcqb_fb_ops; |
| 522 | 523 | ||
| 523 | fbinfo->pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL); | 524 | fbinfo->pseudo_palette = &info->pseudo_pal; |
| 524 | if (!fbinfo->pseudo_palette) { | ||
| 525 | printk(KERN_ERR DRIVER_NAME | ||
| 526 | "Fail to allocate pseudo_palette\n"); | ||
| 527 | |||
| 528 | ret = -ENOMEM; | ||
| 529 | goto out4; | ||
| 530 | } | ||
| 531 | |||
| 532 | memset(fbinfo->pseudo_palette, 0, sizeof(u32) * 16); | ||
| 533 | 525 | ||
| 534 | if (fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0) | 526 | if (fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0) |
| 535 | < 0) { | 527 | < 0) { |
| @@ -537,7 +529,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev) | |||
| 537 | "Fail to allocate colormap (%d entries)\n", | 529 | "Fail to allocate colormap (%d entries)\n", |
| 538 | BFIN_LCD_NBR_PALETTE_ENTRIES); | 530 | BFIN_LCD_NBR_PALETTE_ENTRIES); |
| 539 | ret = -EFAULT; | 531 | ret = -EFAULT; |
| 540 | goto out5; | 532 | goto out4; |
| 541 | } | 533 | } |
| 542 | 534 | ||
| 543 | if (bfin_t350mcqb_request_ports(1)) { | 535 | if (bfin_t350mcqb_request_ports(1)) { |
| @@ -552,11 +544,11 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev) | |||
| 552 | goto out7; | 544 | goto out7; |
| 553 | } | 545 | } |
| 554 | 546 | ||
| 555 | if (request_irq(info->irq, (void *)bfin_t350mcqb_irq_error, IRQF_DISABLED, | 547 | ret = request_irq(info->irq, bfin_t350mcqb_irq_error, IRQF_DISABLED, |
| 556 | "PPI ERROR", info) < 0) { | 548 | "PPI ERROR", info); |
| 549 | if (ret < 0) { | ||
| 557 | printk(KERN_ERR DRIVER_NAME | 550 | printk(KERN_ERR DRIVER_NAME |
| 558 | ": unable to request PPI ERROR IRQ\n"); | 551 | ": unable to request PPI ERROR IRQ\n"); |
| 559 | ret = -EFAULT; | ||
| 560 | goto out7; | 552 | goto out7; |
| 561 | } | 553 | } |
| 562 | 554 | ||
| @@ -584,8 +576,6 @@ out7: | |||
| 584 | bfin_t350mcqb_request_ports(0); | 576 | bfin_t350mcqb_request_ports(0); |
| 585 | out6: | 577 | out6: |
| 586 | fb_dealloc_cmap(&fbinfo->cmap); | 578 | fb_dealloc_cmap(&fbinfo->cmap); |
| 587 | out5: | ||
| 588 | kfree(fbinfo->pseudo_palette); | ||
| 589 | out4: | 579 | out4: |
| 590 | dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, | 580 | dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, |
| 591 | info->dma_handle); | 581 | info->dma_handle); |
| @@ -605,6 +595,8 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev) | |||
| 605 | struct fb_info *fbinfo = platform_get_drvdata(pdev); | 595 | struct fb_info *fbinfo = platform_get_drvdata(pdev); |
| 606 | struct bfin_t350mcqbfb_info *info = fbinfo->par; | 596 | struct bfin_t350mcqbfb_info *info = fbinfo->par; |
| 607 | 597 | ||
| 598 | unregister_framebuffer(fbinfo); | ||
| 599 | |||
| 608 | free_dma(CH_PPI); | 600 | free_dma(CH_PPI); |
| 609 | free_irq(info->irq, info); | 601 | free_irq(info->irq, info); |
| 610 | 602 | ||
| @@ -612,7 +604,6 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev) | |||
| 612 | dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, | 604 | dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, |
| 613 | info->dma_handle); | 605 | info->dma_handle); |
| 614 | 606 | ||
| 615 | kfree(fbinfo->pseudo_palette); | ||
| 616 | fb_dealloc_cmap(&fbinfo->cmap); | 607 | fb_dealloc_cmap(&fbinfo->cmap); |
| 617 | 608 | ||
| 618 | #ifndef NO_BL_SUPPORT | 609 | #ifndef NO_BL_SUPPORT |
| @@ -620,10 +611,11 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev) | |||
| 620 | backlight_device_unregister(bl_dev); | 611 | backlight_device_unregister(bl_dev); |
| 621 | #endif | 612 | #endif |
| 622 | 613 | ||
| 623 | unregister_framebuffer(fbinfo); | ||
| 624 | |||
| 625 | bfin_t350mcqb_request_ports(0); | 614 | bfin_t350mcqb_request_ports(0); |
| 626 | 615 | ||
| 616 | platform_set_drvdata(pdev, NULL); | ||
| 617 | framebuffer_release(fbinfo); | ||
| 618 | |||
| 627 | printk(KERN_INFO DRIVER_NAME ": Unregister LCD driver.\n"); | 619 | printk(KERN_INFO DRIVER_NAME ": Unregister LCD driver.\n"); |
| 628 | 620 | ||
| 629 | return 0; | 621 | return 0; |
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 59a8f73dec73..c0df924766a7 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c | |||
| @@ -37,7 +37,7 @@ struct virtio_pci_device | |||
| 37 | struct pci_dev *pci_dev; | 37 | struct pci_dev *pci_dev; |
| 38 | 38 | ||
| 39 | /* the IO mapping for the PCI config space */ | 39 | /* the IO mapping for the PCI config space */ |
| 40 | void *ioaddr; | 40 | void __iomem *ioaddr; |
| 41 | 41 | ||
| 42 | /* a list of queues so we can dispatch IRQs */ | 42 | /* a list of queues so we can dispatch IRQs */ |
| 43 | spinlock_t lock; | 43 | spinlock_t lock; |
| @@ -111,7 +111,7 @@ static void vp_get(struct virtio_device *vdev, unsigned offset, | |||
| 111 | void *buf, unsigned len) | 111 | void *buf, unsigned len) |
| 112 | { | 112 | { |
| 113 | struct virtio_pci_device *vp_dev = to_vp_device(vdev); | 113 | struct virtio_pci_device *vp_dev = to_vp_device(vdev); |
| 114 | void *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset; | 114 | void __iomem *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset; |
| 115 | u8 *ptr = buf; | 115 | u8 *ptr = buf; |
| 116 | int i; | 116 | int i; |
| 117 | 117 | ||
| @@ -125,7 +125,7 @@ static void vp_set(struct virtio_device *vdev, unsigned offset, | |||
| 125 | const void *buf, unsigned len) | 125 | const void *buf, unsigned len) |
| 126 | { | 126 | { |
| 127 | struct virtio_pci_device *vp_dev = to_vp_device(vdev); | 127 | struct virtio_pci_device *vp_dev = to_vp_device(vdev); |
| 128 | void *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset; | 128 | void __iomem *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset; |
| 129 | const u8 *ptr = buf; | 129 | const u8 *ptr = buf; |
| 130 | int i; | 130 | int i; |
| 131 | 131 | ||
| @@ -388,6 +388,7 @@ static void __devexit virtio_pci_remove(struct pci_dev *pci_dev) | |||
| 388 | { | 388 | { |
| 389 | struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev); | 389 | struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev); |
| 390 | 390 | ||
| 391 | unregister_virtio_device(&vp_dev->vdev); | ||
| 391 | free_irq(pci_dev->irq, vp_dev); | 392 | free_irq(pci_dev->irq, vp_dev); |
| 392 | pci_set_drvdata(pci_dev, NULL); | 393 | pci_set_drvdata(pci_dev, NULL); |
| 393 | pci_iounmap(pci_dev, vp_dev->ioaddr); | 394 | pci_iounmap(pci_dev, vp_dev->ioaddr); |
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c index 1efcad3b6fca..ca90c5192596 100644 --- a/drivers/watchdog/it8712f_wdt.c +++ b/drivers/watchdog/it8712f_wdt.c | |||
| @@ -111,15 +111,6 @@ superio_inw(int reg) | |||
| 111 | return val; | 111 | return val; |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | static void | ||
| 115 | superio_outw(int val, int reg) | ||
| 116 | { | ||
| 117 | outb(reg++, REG); | ||
| 118 | outb((val >> 8) & 0xff, VAL); | ||
| 119 | outb(reg, REG); | ||
| 120 | outb(val & 0xff, VAL); | ||
| 121 | } | ||
| 122 | |||
| 123 | static inline void | 114 | static inline void |
| 124 | superio_select(int ldn) | 115 | superio_select(int ldn) |
| 125 | { | 116 | { |
| @@ -170,9 +161,8 @@ it8712f_wdt_update_margin(void) | |||
| 170 | superio_outb(config, WDT_CONFIG); | 161 | superio_outb(config, WDT_CONFIG); |
| 171 | 162 | ||
| 172 | if (revision >= 0x08) | 163 | if (revision >= 0x08) |
| 173 | superio_outw(units, WDT_TIMEOUT); | 164 | superio_outb(units >> 8, WDT_TIMEOUT + 1); |
| 174 | else | 165 | superio_outb(units, WDT_TIMEOUT); |
| 175 | superio_outb(units, WDT_TIMEOUT); | ||
| 176 | } | 166 | } |
| 177 | 167 | ||
| 178 | static int | 168 | static int |
diff --git a/fs/afs/cell.c b/fs/afs/cell.c index 970d38f30565..788865df1bc9 100644 --- a/fs/afs/cell.c +++ b/fs/afs/cell.c | |||
| @@ -127,14 +127,20 @@ struct afs_cell *afs_cell_create(const char *name, char *vllist) | |||
| 127 | 127 | ||
| 128 | _enter("%s,%s", name, vllist); | 128 | _enter("%s,%s", name, vllist); |
| 129 | 129 | ||
| 130 | down_write(&afs_cells_sem); | ||
| 131 | read_lock(&afs_cells_lock); | ||
| 132 | list_for_each_entry(cell, &afs_cells, link) { | ||
| 133 | if (strcasecmp(cell->name, name) == 0) | ||
| 134 | goto duplicate_name; | ||
| 135 | } | ||
| 136 | read_unlock(&afs_cells_lock); | ||
| 137 | |||
| 130 | cell = afs_cell_alloc(name, vllist); | 138 | cell = afs_cell_alloc(name, vllist); |
| 131 | if (IS_ERR(cell)) { | 139 | if (IS_ERR(cell)) { |
| 132 | _leave(" = %ld", PTR_ERR(cell)); | 140 | _leave(" = %ld", PTR_ERR(cell)); |
| 133 | return cell; | 141 | return cell; |
| 134 | } | 142 | } |
| 135 | 143 | ||
| 136 | down_write(&afs_cells_sem); | ||
| 137 | |||
| 138 | /* add a proc directory for this cell */ | 144 | /* add a proc directory for this cell */ |
| 139 | ret = afs_proc_cell_setup(cell); | 145 | ret = afs_proc_cell_setup(cell); |
| 140 | if (ret < 0) | 146 | if (ret < 0) |
| @@ -167,6 +173,11 @@ error: | |||
| 167 | kfree(cell); | 173 | kfree(cell); |
| 168 | _leave(" = %d", ret); | 174 | _leave(" = %d", ret); |
| 169 | return ERR_PTR(ret); | 175 | return ERR_PTR(ret); |
| 176 | |||
| 177 | duplicate_name: | ||
| 178 | read_unlock(&afs_cells_lock); | ||
| 179 | up_write(&afs_cells_sem); | ||
| 180 | return ERR_PTR(-EEXIST); | ||
| 170 | } | 181 | } |
| 171 | 182 | ||
| 172 | /* | 183 | /* |
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 5ca3625cd39e..9ba16edc0af2 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h | |||
| @@ -573,7 +573,6 @@ extern const struct file_operations afs_mntpt_file_operations; | |||
| 573 | 573 | ||
| 574 | extern int afs_mntpt_check_symlink(struct afs_vnode *, struct key *); | 574 | extern int afs_mntpt_check_symlink(struct afs_vnode *, struct key *); |
| 575 | extern void afs_mntpt_kill_timer(void); | 575 | extern void afs_mntpt_kill_timer(void); |
| 576 | extern void afs_umount_begin(struct vfsmount *, int); | ||
| 577 | 576 | ||
| 578 | /* | 577 | /* |
| 579 | * proc.c | 578 | * proc.c |
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c index a3510b8ba3e7..2f5503902c37 100644 --- a/fs/afs/mntpt.c +++ b/fs/afs/mntpt.c | |||
| @@ -283,11 +283,3 @@ void afs_mntpt_kill_timer(void) | |||
| 283 | cancel_delayed_work(&afs_mntpt_expiry_timer); | 283 | cancel_delayed_work(&afs_mntpt_expiry_timer); |
| 284 | flush_scheduled_work(); | 284 | flush_scheduled_work(); |
| 285 | } | 285 | } |
| 286 | |||
| 287 | /* | ||
| 288 | * begin unmount by attempting to remove all automounted mountpoints we added | ||
| 289 | */ | ||
| 290 | void afs_umount_begin(struct vfsmount *vfsmnt, int flags) | ||
| 291 | { | ||
| 292 | shrink_submounts(vfsmnt, &afs_vfsmounts); | ||
| 293 | } | ||
diff --git a/fs/afs/super.c b/fs/afs/super.c index 36bbce45f44b..4b572b801d8d 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
| @@ -50,7 +50,6 @@ static const struct super_operations afs_super_ops = { | |||
| 50 | .write_inode = afs_write_inode, | 50 | .write_inode = afs_write_inode, |
| 51 | .destroy_inode = afs_destroy_inode, | 51 | .destroy_inode = afs_destroy_inode, |
| 52 | .clear_inode = afs_clear_inode, | 52 | .clear_inode = afs_clear_inode, |
| 53 | .umount_begin = afs_umount_begin, | ||
| 54 | .put_super = afs_put_super, | 53 | .put_super = afs_put_super, |
| 55 | .show_options = generic_show_options, | 54 | .show_options = generic_show_options, |
| 56 | }; | 55 | }; |
diff --git a/fs/buffer.c b/fs/buffer.c index 7ba58386beee..98196327ddf0 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -2564,14 +2564,13 @@ int nobh_write_end(struct file *file, struct address_space *mapping, | |||
| 2564 | struct inode *inode = page->mapping->host; | 2564 | struct inode *inode = page->mapping->host; |
| 2565 | struct buffer_head *head = fsdata; | 2565 | struct buffer_head *head = fsdata; |
| 2566 | struct buffer_head *bh; | 2566 | struct buffer_head *bh; |
| 2567 | BUG_ON(fsdata != NULL && page_has_buffers(page)); | ||
| 2567 | 2568 | ||
| 2568 | if (!PageMappedToDisk(page)) { | 2569 | if (unlikely(copied < len) && !page_has_buffers(page)) |
| 2569 | if (unlikely(copied < len) && !page_has_buffers(page)) | 2570 | attach_nobh_buffers(page, head); |
| 2570 | attach_nobh_buffers(page, head); | 2571 | if (page_has_buffers(page)) |
| 2571 | if (page_has_buffers(page)) | 2572 | return generic_write_end(file, mapping, pos, len, |
| 2572 | return generic_write_end(file, mapping, pos, len, | 2573 | copied, page, fsdata); |
| 2573 | copied, page, fsdata); | ||
| 2574 | } | ||
| 2575 | 2574 | ||
| 2576 | SetPageUptodate(page); | 2575 | SetPageUptodate(page); |
| 2577 | set_page_dirty(page); | 2576 | set_page_dirty(page); |
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index a1a95b027136..56c924033b78 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
| @@ -33,7 +33,6 @@ void dfs_shrink_umount_helper(struct vfsmount *vfsmnt) | |||
| 33 | { | 33 | { |
| 34 | mark_mounts_for_expiry(&cifs_dfs_automount_list); | 34 | mark_mounts_for_expiry(&cifs_dfs_automount_list); |
| 35 | mark_mounts_for_expiry(&cifs_dfs_automount_list); | 35 | mark_mounts_for_expiry(&cifs_dfs_automount_list); |
| 36 | shrink_submounts(vfsmnt, &cifs_dfs_automount_list); | ||
| 37 | } | 36 | } |
| 38 | 37 | ||
| 39 | /** | 38 | /** |
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 1f5a4289b848..1cb5b0a9f2ac 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c | |||
| @@ -261,7 +261,7 @@ static void mode_to_access_flags(umode_t mode, umode_t bits_to_use, | |||
| 261 | return; | 261 | return; |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | static __le16 fill_ace_for_sid(struct cifs_ace *pntace, | 264 | static __u16 fill_ace_for_sid(struct cifs_ace *pntace, |
| 265 | const struct cifs_sid *psid, __u64 nmode, umode_t bits) | 265 | const struct cifs_sid *psid, __u64 nmode, umode_t bits) |
| 266 | { | 266 | { |
| 267 | int i; | 267 | int i; |
| @@ -411,7 +411,7 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, | |||
| 411 | static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid, | 411 | static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid, |
| 412 | struct cifs_sid *pgrpsid, __u64 nmode) | 412 | struct cifs_sid *pgrpsid, __u64 nmode) |
| 413 | { | 413 | { |
| 414 | __le16 size = 0; | 414 | u16 size = 0; |
| 415 | struct cifs_acl *pnndacl; | 415 | struct cifs_acl *pnndacl; |
| 416 | 416 | ||
| 417 | pnndacl = (struct cifs_acl *)((char *)pndacl + sizeof(struct cifs_acl)); | 417 | pnndacl = (struct cifs_acl *)((char *)pndacl + sizeof(struct cifs_acl)); |
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 9816293442ab..0e081d5f32e8 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
| @@ -1620,14 +1620,14 @@ static int journal_init_journal_head_cache(void) | |||
| 1620 | { | 1620 | { |
| 1621 | int retval; | 1621 | int retval; |
| 1622 | 1622 | ||
| 1623 | J_ASSERT(journal_head_cache == 0); | 1623 | J_ASSERT(journal_head_cache == NULL); |
| 1624 | journal_head_cache = kmem_cache_create("journal_head", | 1624 | journal_head_cache = kmem_cache_create("journal_head", |
| 1625 | sizeof(struct journal_head), | 1625 | sizeof(struct journal_head), |
| 1626 | 0, /* offset */ | 1626 | 0, /* offset */ |
| 1627 | SLAB_TEMPORARY, /* flags */ | 1627 | SLAB_TEMPORARY, /* flags */ |
| 1628 | NULL); /* ctor */ | 1628 | NULL); /* ctor */ |
| 1629 | retval = 0; | 1629 | retval = 0; |
| 1630 | if (journal_head_cache == 0) { | 1630 | if (!journal_head_cache) { |
| 1631 | retval = -ENOMEM; | 1631 | retval = -ENOMEM; |
| 1632 | printk(KERN_EMERG "JBD: no memory for journal_head cache\n"); | 1632 | printk(KERN_EMERG "JBD: no memory for journal_head cache\n"); |
| 1633 | } | 1633 | } |
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c index ad2eacf570c6..d5f8eee7c88c 100644 --- a/fs/jbd/revoke.c +++ b/fs/jbd/revoke.c | |||
| @@ -173,13 +173,13 @@ int __init journal_init_revoke_caches(void) | |||
| 173 | 0, | 173 | 0, |
| 174 | SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY, | 174 | SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY, |
| 175 | NULL); | 175 | NULL); |
| 176 | if (revoke_record_cache == 0) | 176 | if (!revoke_record_cache) |
| 177 | return -ENOMEM; | 177 | return -ENOMEM; |
| 178 | 178 | ||
| 179 | revoke_table_cache = kmem_cache_create("revoke_table", | 179 | revoke_table_cache = kmem_cache_create("revoke_table", |
| 180 | sizeof(struct jbd_revoke_table_s), | 180 | sizeof(struct jbd_revoke_table_s), |
| 181 | 0, SLAB_TEMPORARY, NULL); | 181 | 0, SLAB_TEMPORARY, NULL); |
| 182 | if (revoke_table_cache == 0) { | 182 | if (!revoke_table_cache) { |
| 183 | kmem_cache_destroy(revoke_record_cache); | 183 | kmem_cache_destroy(revoke_record_cache); |
| 184 | revoke_record_cache = NULL; | 184 | revoke_record_cache = NULL; |
| 185 | return -ENOMEM; | 185 | return -ENOMEM; |
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 96ba846992e9..954cff001df6 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c | |||
| @@ -219,7 +219,7 @@ static int jbd2_journal_start_thread(journal_t *journal) | |||
| 219 | if (IS_ERR(t)) | 219 | if (IS_ERR(t)) |
| 220 | return PTR_ERR(t); | 220 | return PTR_ERR(t); |
| 221 | 221 | ||
| 222 | wait_event(journal->j_wait_done_commit, journal->j_task != 0); | 222 | wait_event(journal->j_wait_done_commit, journal->j_task != NULL); |
| 223 | return 0; | 223 | return 0; |
| 224 | } | 224 | } |
| 225 | 225 | ||
| @@ -231,7 +231,7 @@ static void journal_kill_thread(journal_t *journal) | |||
| 231 | while (journal->j_task) { | 231 | while (journal->j_task) { |
| 232 | wake_up(&journal->j_wait_commit); | 232 | wake_up(&journal->j_wait_commit); |
| 233 | spin_unlock(&journal->j_state_lock); | 233 | spin_unlock(&journal->j_state_lock); |
| 234 | wait_event(journal->j_wait_done_commit, journal->j_task == 0); | 234 | wait_event(journal->j_wait_done_commit, journal->j_task == NULL); |
| 235 | spin_lock(&journal->j_state_lock); | 235 | spin_lock(&journal->j_state_lock); |
| 236 | } | 236 | } |
| 237 | spin_unlock(&journal->j_state_lock); | 237 | spin_unlock(&journal->j_state_lock); |
| @@ -1969,14 +1969,14 @@ static int journal_init_jbd2_journal_head_cache(void) | |||
| 1969 | { | 1969 | { |
| 1970 | int retval; | 1970 | int retval; |
| 1971 | 1971 | ||
| 1972 | J_ASSERT(jbd2_journal_head_cache == 0); | 1972 | J_ASSERT(jbd2_journal_head_cache == NULL); |
| 1973 | jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head", | 1973 | jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head", |
| 1974 | sizeof(struct journal_head), | 1974 | sizeof(struct journal_head), |
| 1975 | 0, /* offset */ | 1975 | 0, /* offset */ |
| 1976 | SLAB_TEMPORARY, /* flags */ | 1976 | SLAB_TEMPORARY, /* flags */ |
| 1977 | NULL); /* ctor */ | 1977 | NULL); /* ctor */ |
| 1978 | retval = 0; | 1978 | retval = 0; |
| 1979 | if (jbd2_journal_head_cache == 0) { | 1979 | if (!jbd2_journal_head_cache) { |
| 1980 | retval = -ENOMEM; | 1980 | retval = -ENOMEM; |
| 1981 | printk(KERN_EMERG "JBD: no memory for journal_head cache\n"); | 1981 | printk(KERN_EMERG "JBD: no memory for journal_head cache\n"); |
| 1982 | } | 1982 | } |
| @@ -2002,14 +2002,14 @@ static struct journal_head *journal_alloc_journal_head(void) | |||
| 2002 | atomic_inc(&nr_journal_heads); | 2002 | atomic_inc(&nr_journal_heads); |
| 2003 | #endif | 2003 | #endif |
| 2004 | ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS); | 2004 | ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS); |
| 2005 | if (ret == 0) { | 2005 | if (!ret) { |
| 2006 | jbd_debug(1, "out of memory for journal_head\n"); | 2006 | jbd_debug(1, "out of memory for journal_head\n"); |
| 2007 | if (time_after(jiffies, last_warning + 5*HZ)) { | 2007 | if (time_after(jiffies, last_warning + 5*HZ)) { |
| 2008 | printk(KERN_NOTICE "ENOMEM in %s, retrying.\n", | 2008 | printk(KERN_NOTICE "ENOMEM in %s, retrying.\n", |
| 2009 | __FUNCTION__); | 2009 | __FUNCTION__); |
| 2010 | last_warning = jiffies; | 2010 | last_warning = jiffies; |
| 2011 | } | 2011 | } |
| 2012 | while (ret == 0) { | 2012 | while (!ret) { |
| 2013 | yield(); | 2013 | yield(); |
| 2014 | ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS); | 2014 | ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS); |
| 2015 | } | 2015 | } |
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index df36f42e19e1..2e1453a5e998 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c | |||
| @@ -174,13 +174,13 @@ int __init jbd2_journal_init_revoke_caches(void) | |||
| 174 | 0, | 174 | 0, |
| 175 | SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY, | 175 | SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY, |
| 176 | NULL); | 176 | NULL); |
| 177 | if (jbd2_revoke_record_cache == 0) | 177 | if (!jbd2_revoke_record_cache) |
| 178 | return -ENOMEM; | 178 | return -ENOMEM; |
| 179 | 179 | ||
| 180 | jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table", | 180 | jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table", |
| 181 | sizeof(struct jbd2_revoke_table_s), | 181 | sizeof(struct jbd2_revoke_table_s), |
| 182 | 0, SLAB_TEMPORARY, NULL); | 182 | 0, SLAB_TEMPORARY, NULL); |
| 183 | if (jbd2_revoke_table_cache == 0) { | 183 | if (!jbd2_revoke_table_cache) { |
| 184 | kmem_cache_destroy(jbd2_revoke_record_cache); | 184 | kmem_cache_destroy(jbd2_revoke_record_cache); |
| 185 | jbd2_revoke_record_cache = NULL; | 185 | jbd2_revoke_record_cache = NULL; |
| 186 | return -ENOMEM; | 186 | return -ENOMEM; |
diff --git a/fs/namespace.c b/fs/namespace.c index 7953c96a2071..94f026ec990a 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -155,15 +155,15 @@ static void __touch_mnt_namespace(struct mnt_namespace *ns) | |||
| 155 | } | 155 | } |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | static void detach_mnt(struct vfsmount *mnt, struct nameidata *old_nd) | 158 | static void detach_mnt(struct vfsmount *mnt, struct path *old_path) |
| 159 | { | 159 | { |
| 160 | old_nd->path.dentry = mnt->mnt_mountpoint; | 160 | old_path->dentry = mnt->mnt_mountpoint; |
| 161 | old_nd->path.mnt = mnt->mnt_parent; | 161 | old_path->mnt = mnt->mnt_parent; |
| 162 | mnt->mnt_parent = mnt; | 162 | mnt->mnt_parent = mnt; |
| 163 | mnt->mnt_mountpoint = mnt->mnt_root; | 163 | mnt->mnt_mountpoint = mnt->mnt_root; |
| 164 | list_del_init(&mnt->mnt_child); | 164 | list_del_init(&mnt->mnt_child); |
| 165 | list_del_init(&mnt->mnt_hash); | 165 | list_del_init(&mnt->mnt_hash); |
| 166 | old_nd->path.dentry->d_mounted--; | 166 | old_path->dentry->d_mounted--; |
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | void mnt_set_mountpoint(struct vfsmount *mnt, struct dentry *dentry, | 169 | void mnt_set_mountpoint(struct vfsmount *mnt, struct dentry *dentry, |
| @@ -174,12 +174,12 @@ void mnt_set_mountpoint(struct vfsmount *mnt, struct dentry *dentry, | |||
| 174 | dentry->d_mounted++; | 174 | dentry->d_mounted++; |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | static void attach_mnt(struct vfsmount *mnt, struct nameidata *nd) | 177 | static void attach_mnt(struct vfsmount *mnt, struct path *path) |
| 178 | { | 178 | { |
| 179 | mnt_set_mountpoint(nd->path.mnt, nd->path.dentry, mnt); | 179 | mnt_set_mountpoint(path->mnt, path->dentry, mnt); |
| 180 | list_add_tail(&mnt->mnt_hash, mount_hashtable + | 180 | list_add_tail(&mnt->mnt_hash, mount_hashtable + |
| 181 | hash(nd->path.mnt, nd->path.dentry)); | 181 | hash(path->mnt, path->dentry)); |
| 182 | list_add_tail(&mnt->mnt_child, &nd->path.mnt->mnt_mounts); | 182 | list_add_tail(&mnt->mnt_child, &path->mnt->mnt_mounts); |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | /* | 185 | /* |
| @@ -262,10 +262,8 @@ static struct vfsmount *clone_mnt(struct vfsmount *old, struct dentry *root, | |||
| 262 | /* stick the duplicate mount on the same expiry list | 262 | /* stick the duplicate mount on the same expiry list |
| 263 | * as the original if that was on one */ | 263 | * as the original if that was on one */ |
| 264 | if (flag & CL_EXPIRE) { | 264 | if (flag & CL_EXPIRE) { |
| 265 | spin_lock(&vfsmount_lock); | ||
| 266 | if (!list_empty(&old->mnt_expire)) | 265 | if (!list_empty(&old->mnt_expire)) |
| 267 | list_add(&mnt->mnt_expire, &old->mnt_expire); | 266 | list_add(&mnt->mnt_expire, &old->mnt_expire); |
| 268 | spin_unlock(&vfsmount_lock); | ||
| 269 | } | 267 | } |
| 270 | } | 268 | } |
| 271 | return mnt; | 269 | return mnt; |
| @@ -548,6 +546,7 @@ void release_mounts(struct list_head *head) | |||
| 548 | m = mnt->mnt_parent; | 546 | m = mnt->mnt_parent; |
| 549 | mnt->mnt_mountpoint = mnt->mnt_root; | 547 | mnt->mnt_mountpoint = mnt->mnt_root; |
| 550 | mnt->mnt_parent = mnt; | 548 | mnt->mnt_parent = mnt; |
| 549 | m->mnt_ghosts--; | ||
| 551 | spin_unlock(&vfsmount_lock); | 550 | spin_unlock(&vfsmount_lock); |
| 552 | dput(dentry); | 551 | dput(dentry); |
| 553 | mntput(m); | 552 | mntput(m); |
| @@ -572,12 +571,16 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill) | |||
| 572 | __touch_mnt_namespace(p->mnt_ns); | 571 | __touch_mnt_namespace(p->mnt_ns); |
| 573 | p->mnt_ns = NULL; | 572 | p->mnt_ns = NULL; |
| 574 | list_del_init(&p->mnt_child); | 573 | list_del_init(&p->mnt_child); |
| 575 | if (p->mnt_parent != p) | 574 | if (p->mnt_parent != p) { |
| 575 | p->mnt_parent->mnt_ghosts++; | ||
| 576 | p->mnt_mountpoint->d_mounted--; | 576 | p->mnt_mountpoint->d_mounted--; |
| 577 | } | ||
| 577 | change_mnt_propagation(p, MS_PRIVATE); | 578 | change_mnt_propagation(p, MS_PRIVATE); |
| 578 | } | 579 | } |
| 579 | } | 580 | } |
| 580 | 581 | ||
| 582 | static void shrink_submounts(struct vfsmount *mnt, struct list_head *umounts); | ||
| 583 | |||
| 581 | static int do_umount(struct vfsmount *mnt, int flags) | 584 | static int do_umount(struct vfsmount *mnt, int flags) |
| 582 | { | 585 | { |
| 583 | struct super_block *sb = mnt->mnt_sb; | 586 | struct super_block *sb = mnt->mnt_sb; |
| @@ -650,6 +653,9 @@ static int do_umount(struct vfsmount *mnt, int flags) | |||
| 650 | spin_lock(&vfsmount_lock); | 653 | spin_lock(&vfsmount_lock); |
| 651 | event++; | 654 | event++; |
| 652 | 655 | ||
| 656 | if (!(flags & MNT_DETACH)) | ||
| 657 | shrink_submounts(mnt, &umount_list); | ||
| 658 | |||
| 653 | retval = -EBUSY; | 659 | retval = -EBUSY; |
| 654 | if (flags & MNT_DETACH || !propagate_mount_busy(mnt, 2)) { | 660 | if (flags & MNT_DETACH || !propagate_mount_busy(mnt, 2)) { |
| 655 | if (!list_empty(&mnt->mnt_list)) | 661 | if (!list_empty(&mnt->mnt_list)) |
| @@ -744,7 +750,7 @@ struct vfsmount *copy_tree(struct vfsmount *mnt, struct dentry *dentry, | |||
| 744 | int flag) | 750 | int flag) |
| 745 | { | 751 | { |
| 746 | struct vfsmount *res, *p, *q, *r, *s; | 752 | struct vfsmount *res, *p, *q, *r, *s; |
| 747 | struct nameidata nd; | 753 | struct path path; |
| 748 | 754 | ||
| 749 | if (!(flag & CL_COPY_ALL) && IS_MNT_UNBINDABLE(mnt)) | 755 | if (!(flag & CL_COPY_ALL) && IS_MNT_UNBINDABLE(mnt)) |
| 750 | return NULL; | 756 | return NULL; |
| @@ -769,14 +775,14 @@ struct vfsmount *copy_tree(struct vfsmount *mnt, struct dentry *dentry, | |||
| 769 | q = q->mnt_parent; | 775 | q = q->mnt_parent; |
| 770 | } | 776 | } |
| 771 | p = s; | 777 | p = s; |
| 772 | nd.path.mnt = q; | 778 | path.mnt = q; |
| 773 | nd.path.dentry = p->mnt_mountpoint; | 779 | path.dentry = p->mnt_mountpoint; |
| 774 | q = clone_mnt(p, p->mnt_root, flag); | 780 | q = clone_mnt(p, p->mnt_root, flag); |
| 775 | if (!q) | 781 | if (!q) |
| 776 | goto Enomem; | 782 | goto Enomem; |
| 777 | spin_lock(&vfsmount_lock); | 783 | spin_lock(&vfsmount_lock); |
| 778 | list_add_tail(&q->mnt_list, &res->mnt_list); | 784 | list_add_tail(&q->mnt_list, &res->mnt_list); |
| 779 | attach_mnt(q, &nd); | 785 | attach_mnt(q, &path); |
| 780 | spin_unlock(&vfsmount_lock); | 786 | spin_unlock(&vfsmount_lock); |
| 781 | } | 787 | } |
| 782 | } | 788 | } |
| @@ -876,11 +882,11 @@ void drop_collected_mounts(struct vfsmount *mnt) | |||
| 876 | * in allocations. | 882 | * in allocations. |
| 877 | */ | 883 | */ |
| 878 | static int attach_recursive_mnt(struct vfsmount *source_mnt, | 884 | static int attach_recursive_mnt(struct vfsmount *source_mnt, |
| 879 | struct nameidata *nd, struct nameidata *parent_nd) | 885 | struct path *path, struct path *parent_path) |
| 880 | { | 886 | { |
| 881 | LIST_HEAD(tree_list); | 887 | LIST_HEAD(tree_list); |
| 882 | struct vfsmount *dest_mnt = nd->path.mnt; | 888 | struct vfsmount *dest_mnt = path->mnt; |
| 883 | struct dentry *dest_dentry = nd->path.dentry; | 889 | struct dentry *dest_dentry = path->dentry; |
| 884 | struct vfsmount *child, *p; | 890 | struct vfsmount *child, *p; |
| 885 | 891 | ||
| 886 | if (propagate_mnt(dest_mnt, dest_dentry, source_mnt, &tree_list)) | 892 | if (propagate_mnt(dest_mnt, dest_dentry, source_mnt, &tree_list)) |
| @@ -892,9 +898,9 @@ static int attach_recursive_mnt(struct vfsmount *source_mnt, | |||
| 892 | } | 898 | } |
| 893 | 899 | ||
| 894 | spin_lock(&vfsmount_lock); | 900 | spin_lock(&vfsmount_lock); |
| 895 | if (parent_nd) { | 901 | if (parent_path) { |
| 896 | detach_mnt(source_mnt, parent_nd); | 902 | detach_mnt(source_mnt, parent_path); |
| 897 | attach_mnt(source_mnt, nd); | 903 | attach_mnt(source_mnt, path); |
| 898 | touch_mnt_namespace(current->nsproxy->mnt_ns); | 904 | touch_mnt_namespace(current->nsproxy->mnt_ns); |
| 899 | } else { | 905 | } else { |
| 900 | mnt_set_mountpoint(dest_mnt, dest_dentry, source_mnt); | 906 | mnt_set_mountpoint(dest_mnt, dest_dentry, source_mnt); |
| @@ -930,7 +936,7 @@ static int graft_tree(struct vfsmount *mnt, struct nameidata *nd) | |||
| 930 | 936 | ||
| 931 | err = -ENOENT; | 937 | err = -ENOENT; |
| 932 | if (IS_ROOT(nd->path.dentry) || !d_unhashed(nd->path.dentry)) | 938 | if (IS_ROOT(nd->path.dentry) || !d_unhashed(nd->path.dentry)) |
| 933 | err = attach_recursive_mnt(mnt, nd, NULL); | 939 | err = attach_recursive_mnt(mnt, &nd->path, NULL); |
| 934 | out_unlock: | 940 | out_unlock: |
| 935 | mutex_unlock(&nd->path.dentry->d_inode->i_mutex); | 941 | mutex_unlock(&nd->path.dentry->d_inode->i_mutex); |
| 936 | if (!err) | 942 | if (!err) |
| @@ -1059,7 +1065,8 @@ static inline int tree_contains_unbindable(struct vfsmount *mnt) | |||
| 1059 | */ | 1065 | */ |
| 1060 | static noinline int do_move_mount(struct nameidata *nd, char *old_name) | 1066 | static noinline int do_move_mount(struct nameidata *nd, char *old_name) |
| 1061 | { | 1067 | { |
| 1062 | struct nameidata old_nd, parent_nd; | 1068 | struct nameidata old_nd; |
| 1069 | struct path parent_path; | ||
| 1063 | struct vfsmount *p; | 1070 | struct vfsmount *p; |
| 1064 | int err = 0; | 1071 | int err = 0; |
| 1065 | if (!capable(CAP_SYS_ADMIN)) | 1072 | if (!capable(CAP_SYS_ADMIN)) |
| @@ -1114,21 +1121,19 @@ static noinline int do_move_mount(struct nameidata *nd, char *old_name) | |||
| 1114 | if (p == old_nd.path.mnt) | 1121 | if (p == old_nd.path.mnt) |
| 1115 | goto out1; | 1122 | goto out1; |
| 1116 | 1123 | ||
| 1117 | err = attach_recursive_mnt(old_nd.path.mnt, nd, &parent_nd); | 1124 | err = attach_recursive_mnt(old_nd.path.mnt, &nd->path, &parent_path); |
| 1118 | if (err) | 1125 | if (err) |
| 1119 | goto out1; | 1126 | goto out1; |
| 1120 | 1127 | ||
| 1121 | spin_lock(&vfsmount_lock); | ||
| 1122 | /* if the mount is moved, it should no longer be expire | 1128 | /* if the mount is moved, it should no longer be expire |
| 1123 | * automatically */ | 1129 | * automatically */ |
| 1124 | list_del_init(&old_nd.path.mnt->mnt_expire); | 1130 | list_del_init(&old_nd.path.mnt->mnt_expire); |
| 1125 | spin_unlock(&vfsmount_lock); | ||
| 1126 | out1: | 1131 | out1: |
| 1127 | mutex_unlock(&nd->path.dentry->d_inode->i_mutex); | 1132 | mutex_unlock(&nd->path.dentry->d_inode->i_mutex); |
| 1128 | out: | 1133 | out: |
| 1129 | up_write(&namespace_sem); | 1134 | up_write(&namespace_sem); |
| 1130 | if (!err) | 1135 | if (!err) |
| 1131 | path_put(&parent_nd.path); | 1136 | path_put(&parent_path); |
| 1132 | path_put(&old_nd.path); | 1137 | path_put(&old_nd.path); |
| 1133 | return err; | 1138 | return err; |
| 1134 | } | 1139 | } |
| @@ -1189,12 +1194,9 @@ int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd, | |||
| 1189 | if ((err = graft_tree(newmnt, nd))) | 1194 | if ((err = graft_tree(newmnt, nd))) |
| 1190 | goto unlock; | 1195 | goto unlock; |
| 1191 | 1196 | ||
| 1192 | if (fslist) { | 1197 | if (fslist) /* add to the specified expiration list */ |
| 1193 | /* add to the specified expiration list */ | ||
| 1194 | spin_lock(&vfsmount_lock); | ||
| 1195 | list_add_tail(&newmnt->mnt_expire, fslist); | 1198 | list_add_tail(&newmnt->mnt_expire, fslist); |
| 1196 | spin_unlock(&vfsmount_lock); | 1199 | |
| 1197 | } | ||
| 1198 | up_write(&namespace_sem); | 1200 | up_write(&namespace_sem); |
| 1199 | return 0; | 1201 | return 0; |
| 1200 | 1202 | ||
| @@ -1206,75 +1208,6 @@ unlock: | |||
| 1206 | 1208 | ||
| 1207 | EXPORT_SYMBOL_GPL(do_add_mount); | 1209 | EXPORT_SYMBOL_GPL(do_add_mount); |
| 1208 | 1210 | ||
| 1209 | static void expire_mount(struct vfsmount *mnt, struct list_head *mounts, | ||
| 1210 | struct list_head *umounts) | ||
| 1211 | { | ||
| 1212 | spin_lock(&vfsmount_lock); | ||
| 1213 | |||
| 1214 | /* | ||
| 1215 | * Check if mount is still attached, if not, let whoever holds it deal | ||
| 1216 | * with the sucker | ||
| 1217 | */ | ||
| 1218 | if (mnt->mnt_parent == mnt) { | ||
| 1219 | spin_unlock(&vfsmount_lock); | ||
| 1220 | return; | ||
| 1221 | } | ||
| 1222 | |||
| 1223 | /* | ||
| 1224 | * Check that it is still dead: the count should now be 2 - as | ||
| 1225 | * contributed by the vfsmount parent and the mntget above | ||
| 1226 | */ | ||
| 1227 | if (!propagate_mount_busy(mnt, 2)) { | ||
| 1228 | /* delete from the namespace */ | ||
| 1229 | touch_mnt_namespace(mnt->mnt_ns); | ||
| 1230 | list_del_init(&mnt->mnt_list); | ||
| 1231 | mnt->mnt_ns = NULL; | ||
| 1232 | umount_tree(mnt, 1, umounts); | ||
| 1233 | spin_unlock(&vfsmount_lock); | ||
| 1234 | } else { | ||
| 1235 | /* | ||
| 1236 | * Someone brought it back to life whilst we didn't have any | ||
| 1237 | * locks held so return it to the expiration list | ||
| 1238 | */ | ||
| 1239 | list_add_tail(&mnt->mnt_expire, mounts); | ||
| 1240 | spin_unlock(&vfsmount_lock); | ||
| 1241 | } | ||
| 1242 | } | ||
| 1243 | |||
| 1244 | /* | ||
| 1245 | * go through the vfsmounts we've just consigned to the graveyard to | ||
| 1246 | * - check that they're still dead | ||
| 1247 | * - delete the vfsmount from the appropriate namespace under lock | ||
| 1248 | * - dispose of the corpse | ||
| 1249 | */ | ||
| 1250 | static void expire_mount_list(struct list_head *graveyard, struct list_head *mounts) | ||
| 1251 | { | ||
| 1252 | struct mnt_namespace *ns; | ||
| 1253 | struct vfsmount *mnt; | ||
| 1254 | |||
| 1255 | while (!list_empty(graveyard)) { | ||
| 1256 | LIST_HEAD(umounts); | ||
| 1257 | mnt = list_first_entry(graveyard, struct vfsmount, mnt_expire); | ||
| 1258 | list_del_init(&mnt->mnt_expire); | ||
| 1259 | |||
| 1260 | /* don't do anything if the namespace is dead - all the | ||
| 1261 | * vfsmounts from it are going away anyway */ | ||
| 1262 | ns = mnt->mnt_ns; | ||
| 1263 | if (!ns || !ns->root) | ||
| 1264 | continue; | ||
| 1265 | get_mnt_ns(ns); | ||
| 1266 | |||
| 1267 | spin_unlock(&vfsmount_lock); | ||
| 1268 | down_write(&namespace_sem); | ||
| 1269 | expire_mount(mnt, mounts, &umounts); | ||
| 1270 | up_write(&namespace_sem); | ||
| 1271 | release_mounts(&umounts); | ||
| 1272 | mntput(mnt); | ||
| 1273 | put_mnt_ns(ns); | ||
| 1274 | spin_lock(&vfsmount_lock); | ||
| 1275 | } | ||
| 1276 | } | ||
| 1277 | |||
| 1278 | /* | 1211 | /* |
| 1279 | * process a list of expirable mountpoints with the intent of discarding any | 1212 | * process a list of expirable mountpoints with the intent of discarding any |
| 1280 | * mountpoints that aren't in use and haven't been touched since last we came | 1213 | * mountpoints that aren't in use and haven't been touched since last we came |
| @@ -1284,10 +1217,12 @@ void mark_mounts_for_expiry(struct list_head *mounts) | |||
| 1284 | { | 1217 | { |
| 1285 | struct vfsmount *mnt, *next; | 1218 | struct vfsmount *mnt, *next; |
| 1286 | LIST_HEAD(graveyard); | 1219 | LIST_HEAD(graveyard); |
| 1220 | LIST_HEAD(umounts); | ||
| 1287 | 1221 | ||
| 1288 | if (list_empty(mounts)) | 1222 | if (list_empty(mounts)) |
| 1289 | return; | 1223 | return; |
| 1290 | 1224 | ||
| 1225 | down_write(&namespace_sem); | ||
| 1291 | spin_lock(&vfsmount_lock); | 1226 | spin_lock(&vfsmount_lock); |
| 1292 | 1227 | ||
| 1293 | /* extract from the expiration list every vfsmount that matches the | 1228 | /* extract from the expiration list every vfsmount that matches the |
| @@ -1298,16 +1233,19 @@ void mark_mounts_for_expiry(struct list_head *mounts) | |||
| 1298 | */ | 1233 | */ |
| 1299 | list_for_each_entry_safe(mnt, next, mounts, mnt_expire) { | 1234 | list_for_each_entry_safe(mnt, next, mounts, mnt_expire) { |
| 1300 | if (!xchg(&mnt->mnt_expiry_mark, 1) || | 1235 | if (!xchg(&mnt->mnt_expiry_mark, 1) || |
| 1301 | atomic_read(&mnt->mnt_count) != 1) | 1236 | propagate_mount_busy(mnt, 1)) |
| 1302 | continue; | 1237 | continue; |
| 1303 | |||
| 1304 | mntget(mnt); | ||
| 1305 | list_move(&mnt->mnt_expire, &graveyard); | 1238 | list_move(&mnt->mnt_expire, &graveyard); |
| 1306 | } | 1239 | } |
| 1307 | 1240 | while (!list_empty(&graveyard)) { | |
| 1308 | expire_mount_list(&graveyard, mounts); | 1241 | mnt = list_first_entry(&graveyard, struct vfsmount, mnt_expire); |
| 1309 | 1242 | touch_mnt_namespace(mnt->mnt_ns); | |
| 1243 | umount_tree(mnt, 1, &umounts); | ||
| 1244 | } | ||
| 1310 | spin_unlock(&vfsmount_lock); | 1245 | spin_unlock(&vfsmount_lock); |
| 1246 | up_write(&namespace_sem); | ||
| 1247 | |||
| 1248 | release_mounts(&umounts); | ||
| 1311 | } | 1249 | } |
| 1312 | 1250 | ||
| 1313 | EXPORT_SYMBOL_GPL(mark_mounts_for_expiry); | 1251 | EXPORT_SYMBOL_GPL(mark_mounts_for_expiry); |
| @@ -1343,7 +1281,6 @@ resume: | |||
| 1343 | } | 1281 | } |
| 1344 | 1282 | ||
| 1345 | if (!propagate_mount_busy(mnt, 1)) { | 1283 | if (!propagate_mount_busy(mnt, 1)) { |
| 1346 | mntget(mnt); | ||
| 1347 | list_move_tail(&mnt->mnt_expire, graveyard); | 1284 | list_move_tail(&mnt->mnt_expire, graveyard); |
| 1348 | found++; | 1285 | found++; |
| 1349 | } | 1286 | } |
| @@ -1363,22 +1300,22 @@ resume: | |||
| 1363 | * process a list of expirable mountpoints with the intent of discarding any | 1300 | * process a list of expirable mountpoints with the intent of discarding any |
| 1364 | * submounts of a specific parent mountpoint | 1301 | * submounts of a specific parent mountpoint |
| 1365 | */ | 1302 | */ |
| 1366 | void shrink_submounts(struct vfsmount *mountpoint, struct list_head *mounts) | 1303 | static void shrink_submounts(struct vfsmount *mnt, struct list_head *umounts) |
| 1367 | { | 1304 | { |
| 1368 | LIST_HEAD(graveyard); | 1305 | LIST_HEAD(graveyard); |
| 1369 | int found; | 1306 | struct vfsmount *m; |
| 1370 | |||
| 1371 | spin_lock(&vfsmount_lock); | ||
| 1372 | 1307 | ||
| 1373 | /* extract submounts of 'mountpoint' from the expiration list */ | 1308 | /* extract submounts of 'mountpoint' from the expiration list */ |
| 1374 | while ((found = select_submounts(mountpoint, &graveyard)) != 0) | 1309 | while (select_submounts(mnt, &graveyard)) { |
| 1375 | expire_mount_list(&graveyard, mounts); | 1310 | while (!list_empty(&graveyard)) { |
| 1376 | 1311 | m = list_first_entry(&graveyard, struct vfsmount, | |
| 1377 | spin_unlock(&vfsmount_lock); | 1312 | mnt_expire); |
| 1313 | touch_mnt_namespace(mnt->mnt_ns); | ||
| 1314 | umount_tree(mnt, 1, umounts); | ||
| 1315 | } | ||
| 1316 | } | ||
| 1378 | } | 1317 | } |
| 1379 | 1318 | ||
| 1380 | EXPORT_SYMBOL_GPL(shrink_submounts); | ||
| 1381 | |||
| 1382 | /* | 1319 | /* |
| 1383 | * Some copy_from_user() implementations do not return the exact number of | 1320 | * Some copy_from_user() implementations do not return the exact number of |
| 1384 | * bytes remaining to copy on a fault. But copy_mount_options() requires that. | 1321 | * bytes remaining to copy on a fault. But copy_mount_options() requires that. |
| @@ -1683,7 +1620,7 @@ void set_fs_pwd(struct fs_struct *fs, struct path *path) | |||
| 1683 | path_put(&old_pwd); | 1620 | path_put(&old_pwd); |
| 1684 | } | 1621 | } |
| 1685 | 1622 | ||
| 1686 | static void chroot_fs_refs(struct nameidata *old_nd, struct nameidata *new_nd) | 1623 | static void chroot_fs_refs(struct path *old_root, struct path *new_root) |
| 1687 | { | 1624 | { |
| 1688 | struct task_struct *g, *p; | 1625 | struct task_struct *g, *p; |
| 1689 | struct fs_struct *fs; | 1626 | struct fs_struct *fs; |
| @@ -1695,12 +1632,12 @@ static void chroot_fs_refs(struct nameidata *old_nd, struct nameidata *new_nd) | |||
| 1695 | if (fs) { | 1632 | if (fs) { |
| 1696 | atomic_inc(&fs->count); | 1633 | atomic_inc(&fs->count); |
| 1697 | task_unlock(p); | 1634 | task_unlock(p); |
| 1698 | if (fs->root.dentry == old_nd->path.dentry | 1635 | if (fs->root.dentry == old_root->dentry |
| 1699 | && fs->root.mnt == old_nd->path.mnt) | 1636 | && fs->root.mnt == old_root->mnt) |
| 1700 | set_fs_root(fs, &new_nd->path); | 1637 | set_fs_root(fs, new_root); |
| 1701 | if (fs->pwd.dentry == old_nd->path.dentry | 1638 | if (fs->pwd.dentry == old_root->dentry |
| 1702 | && fs->pwd.mnt == old_nd->path.mnt) | 1639 | && fs->pwd.mnt == old_root->mnt) |
| 1703 | set_fs_pwd(fs, &new_nd->path); | 1640 | set_fs_pwd(fs, new_root); |
| 1704 | put_fs_struct(fs); | 1641 | put_fs_struct(fs); |
| 1705 | } else | 1642 | } else |
| 1706 | task_unlock(p); | 1643 | task_unlock(p); |
| @@ -1737,7 +1674,8 @@ asmlinkage long sys_pivot_root(const char __user * new_root, | |||
| 1737 | const char __user * put_old) | 1674 | const char __user * put_old) |
| 1738 | { | 1675 | { |
| 1739 | struct vfsmount *tmp; | 1676 | struct vfsmount *tmp; |
| 1740 | struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd; | 1677 | struct nameidata new_nd, old_nd, user_nd; |
| 1678 | struct path parent_path, root_parent; | ||
| 1741 | int error; | 1679 | int error; |
| 1742 | 1680 | ||
| 1743 | if (!capable(CAP_SYS_ADMIN)) | 1681 | if (!capable(CAP_SYS_ADMIN)) |
| @@ -1811,19 +1749,19 @@ asmlinkage long sys_pivot_root(const char __user * new_root, | |||
| 1811 | goto out3; | 1749 | goto out3; |
| 1812 | } else if (!is_subdir(old_nd.path.dentry, new_nd.path.dentry)) | 1750 | } else if (!is_subdir(old_nd.path.dentry, new_nd.path.dentry)) |
| 1813 | goto out3; | 1751 | goto out3; |
| 1814 | detach_mnt(new_nd.path.mnt, &parent_nd); | 1752 | detach_mnt(new_nd.path.mnt, &parent_path); |
| 1815 | detach_mnt(user_nd.path.mnt, &root_parent); | 1753 | detach_mnt(user_nd.path.mnt, &root_parent); |
| 1816 | /* mount old root on put_old */ | 1754 | /* mount old root on put_old */ |
| 1817 | attach_mnt(user_nd.path.mnt, &old_nd); | 1755 | attach_mnt(user_nd.path.mnt, &old_nd.path); |
| 1818 | /* mount new_root on / */ | 1756 | /* mount new_root on / */ |
| 1819 | attach_mnt(new_nd.path.mnt, &root_parent); | 1757 | attach_mnt(new_nd.path.mnt, &root_parent); |
| 1820 | touch_mnt_namespace(current->nsproxy->mnt_ns); | 1758 | touch_mnt_namespace(current->nsproxy->mnt_ns); |
| 1821 | spin_unlock(&vfsmount_lock); | 1759 | spin_unlock(&vfsmount_lock); |
| 1822 | chroot_fs_refs(&user_nd, &new_nd); | 1760 | chroot_fs_refs(&user_nd.path, &new_nd.path); |
| 1823 | security_sb_post_pivotroot(&user_nd, &new_nd); | 1761 | security_sb_post_pivotroot(&user_nd, &new_nd); |
| 1824 | error = 0; | 1762 | error = 0; |
| 1825 | path_put(&root_parent.path); | 1763 | path_put(&root_parent); |
| 1826 | path_put(&parent_nd.path); | 1764 | path_put(&parent_path); |
| 1827 | out2: | 1765 | out2: |
| 1828 | mutex_unlock(&old_nd.path.dentry->d_inode->i_mutex); | 1766 | mutex_unlock(&old_nd.path.dentry->d_inode->i_mutex); |
| 1829 | up_write(&namespace_sem); | 1767 | up_write(&namespace_sem); |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index dd4dfcd632ec..f9219024f31a 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -589,8 +589,6 @@ static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags) | |||
| 589 | struct nfs_server *server = NFS_SB(vfsmnt->mnt_sb); | 589 | struct nfs_server *server = NFS_SB(vfsmnt->mnt_sb); |
| 590 | struct rpc_clnt *rpc; | 590 | struct rpc_clnt *rpc; |
| 591 | 591 | ||
| 592 | shrink_submounts(vfsmnt, &nfs_automount_list); | ||
| 593 | |||
| 594 | if (!(flags & MNT_FORCE)) | 592 | if (!(flags & MNT_FORCE)) |
| 595 | return; | 593 | return; |
| 596 | /* -EIO all pending I/O */ | 594 | /* -EIO all pending I/O */ |
diff --git a/fs/pnode.c b/fs/pnode.c index 05ba692bc540..1d8f5447f3f7 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
| @@ -225,7 +225,7 @@ out: | |||
| 225 | */ | 225 | */ |
| 226 | static inline int do_refcount_check(struct vfsmount *mnt, int count) | 226 | static inline int do_refcount_check(struct vfsmount *mnt, int count) |
| 227 | { | 227 | { |
| 228 | int mycount = atomic_read(&mnt->mnt_count); | 228 | int mycount = atomic_read(&mnt->mnt_count) - mnt->mnt_ghosts; |
| 229 | return (mycount > count); | 229 | return (mycount > count); |
| 230 | } | 230 | } |
| 231 | 231 | ||
diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c index f85c5cf4934c..7ee4208793b6 100644 --- a/fs/reiserfs/do_balan.c +++ b/fs/reiserfs/do_balan.c | |||
| @@ -283,7 +283,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h | |||
| 283 | return balance_leaf_when_delete(tb, flag); | 283 | return balance_leaf_when_delete(tb, flag); |
| 284 | 284 | ||
| 285 | zeros_num = 0; | 285 | zeros_num = 0; |
| 286 | if (flag == M_INSERT && body == 0) | 286 | if (flag == M_INSERT && !body) |
| 287 | zeros_num = ih_item_len(ih); | 287 | zeros_num = ih_item_len(ih); |
| 288 | 288 | ||
| 289 | pos_in_item = tb->tb_path->pos_in_item; | 289 | pos_in_item = tb->tb_path->pos_in_item; |
| @@ -1728,7 +1728,7 @@ struct buffer_head *get_FEB(struct tree_balance *tb) | |||
| 1728 | struct buffer_info bi; | 1728 | struct buffer_info bi; |
| 1729 | 1729 | ||
| 1730 | for (i = 0; i < MAX_FEB_SIZE; i++) | 1730 | for (i = 0; i < MAX_FEB_SIZE; i++) |
| 1731 | if (tb->FEB[i] != 0) | 1731 | if (tb->FEB[i] != NULL) |
| 1732 | break; | 1732 | break; |
| 1733 | 1733 | ||
| 1734 | if (i == MAX_FEB_SIZE) | 1734 | if (i == MAX_FEB_SIZE) |
| @@ -1827,7 +1827,7 @@ int get_left_neighbor_position(struct tree_balance *tb, int h) | |||
| 1827 | { | 1827 | { |
| 1828 | int Sh_position = PATH_H_POSITION(tb->tb_path, h + 1); | 1828 | int Sh_position = PATH_H_POSITION(tb->tb_path, h + 1); |
| 1829 | 1829 | ||
| 1830 | RFALSE(PATH_H_PPARENT(tb->tb_path, h) == 0 || tb->FL[h] == 0, | 1830 | RFALSE(PATH_H_PPARENT(tb->tb_path, h) == NULL || tb->FL[h] == NULL, |
| 1831 | "vs-12325: FL[%d](%p) or F[%d](%p) does not exist", | 1831 | "vs-12325: FL[%d](%p) or F[%d](%p) does not exist", |
| 1832 | h, tb->FL[h], h, PATH_H_PPARENT(tb->tb_path, h)); | 1832 | h, tb->FL[h], h, PATH_H_PPARENT(tb->tb_path, h)); |
| 1833 | 1833 | ||
| @@ -1841,7 +1841,7 @@ int get_right_neighbor_position(struct tree_balance *tb, int h) | |||
| 1841 | { | 1841 | { |
| 1842 | int Sh_position = PATH_H_POSITION(tb->tb_path, h + 1); | 1842 | int Sh_position = PATH_H_POSITION(tb->tb_path, h + 1); |
| 1843 | 1843 | ||
| 1844 | RFALSE(PATH_H_PPARENT(tb->tb_path, h) == 0 || tb->FR[h] == 0, | 1844 | RFALSE(PATH_H_PPARENT(tb->tb_path, h) == NULL || tb->FR[h] == NULL, |
| 1845 | "vs-12330: F[%d](%p) or FR[%d](%p) does not exist", | 1845 | "vs-12330: F[%d](%p) or FR[%d](%p) does not exist", |
| 1846 | h, PATH_H_PPARENT(tb->tb_path, h), h, tb->FR[h]); | 1846 | h, PATH_H_PPARENT(tb->tb_path, h), h, tb->FR[h]); |
| 1847 | 1847 | ||
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c index 0ee35c6c9b72..07d05e0842b7 100644 --- a/fs/reiserfs/fix_node.c +++ b/fs/reiserfs/fix_node.c | |||
| @@ -153,7 +153,7 @@ static void create_virtual_node(struct tree_balance *tb, int h) | |||
| 153 | if (vn->vn_mode == M_INSERT) { | 153 | if (vn->vn_mode == M_INSERT) { |
| 154 | struct virtual_item *vi = vn->vn_vi + vn->vn_affected_item_num; | 154 | struct virtual_item *vi = vn->vn_vi + vn->vn_affected_item_num; |
| 155 | 155 | ||
| 156 | RFALSE(vn->vn_ins_ih == 0, | 156 | RFALSE(vn->vn_ins_ih == NULL, |
| 157 | "vs-8040: item header of inserted item is not specified"); | 157 | "vs-8040: item header of inserted item is not specified"); |
| 158 | vi->vi_item_len = tb->insert_size[0]; | 158 | vi->vi_item_len = tb->insert_size[0]; |
| 159 | vi->vi_ih = vn->vn_ins_ih; | 159 | vi->vi_ih = vn->vn_ins_ih; |
| @@ -857,7 +857,8 @@ static int get_lfree(struct tree_balance *tb, int h) | |||
| 857 | struct buffer_head *l, *f; | 857 | struct buffer_head *l, *f; |
| 858 | int order; | 858 | int order; |
| 859 | 859 | ||
| 860 | if ((f = PATH_H_PPARENT(tb->tb_path, h)) == 0 || (l = tb->FL[h]) == 0) | 860 | if ((f = PATH_H_PPARENT(tb->tb_path, h)) == NULL || |
| 861 | (l = tb->FL[h]) == NULL) | ||
| 861 | return 0; | 862 | return 0; |
| 862 | 863 | ||
| 863 | if (f == l) | 864 | if (f == l) |
| @@ -878,7 +879,8 @@ static int get_rfree(struct tree_balance *tb, int h) | |||
| 878 | struct buffer_head *r, *f; | 879 | struct buffer_head *r, *f; |
| 879 | int order; | 880 | int order; |
| 880 | 881 | ||
| 881 | if ((f = PATH_H_PPARENT(tb->tb_path, h)) == 0 || (r = tb->FR[h]) == 0) | 882 | if ((f = PATH_H_PPARENT(tb->tb_path, h)) == NULL || |
| 883 | (r = tb->FR[h]) == NULL) | ||
| 882 | return 0; | 884 | return 0; |
| 883 | 885 | ||
| 884 | if (f == r) | 886 | if (f == r) |
diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c index 281f8061ac58..6de060a6aa7f 100644 --- a/fs/reiserfs/lbalance.c +++ b/fs/reiserfs/lbalance.c | |||
| @@ -626,7 +626,7 @@ static void leaf_define_dest_src_infos(int shift_mode, struct tree_balance *tb, | |||
| 626 | "vs-10250: leaf_define_dest_src_infos: shift type is unknown (%d)", | 626 | "vs-10250: leaf_define_dest_src_infos: shift type is unknown (%d)", |
| 627 | shift_mode); | 627 | shift_mode); |
| 628 | } | 628 | } |
| 629 | RFALSE(src_bi->bi_bh == 0 || dest_bi->bi_bh == 0, | 629 | RFALSE(!src_bi->bi_bh || !dest_bi->bi_bh, |
| 630 | "vs-10260: mode==%d, source (%p) or dest (%p) buffer is initialized incorrectly", | 630 | "vs-10260: mode==%d, source (%p) or dest (%p) buffer is initialized incorrectly", |
| 631 | shift_mode, src_bi->bi_bh, dest_bi->bi_bh); | 631 | shift_mode, src_bi->bi_bh, dest_bi->bi_bh); |
| 632 | } | 632 | } |
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index b378eea332ca..8867533cb727 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
| @@ -452,7 +452,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, | |||
| 452 | buflen = DEH_SIZE + ROUND_UP(namelen); | 452 | buflen = DEH_SIZE + ROUND_UP(namelen); |
| 453 | if (buflen > sizeof(small_buf)) { | 453 | if (buflen > sizeof(small_buf)) { |
| 454 | buffer = kmalloc(buflen, GFP_NOFS); | 454 | buffer = kmalloc(buflen, GFP_NOFS); |
| 455 | if (buffer == 0) | 455 | if (!buffer) |
| 456 | return -ENOMEM; | 456 | return -ENOMEM; |
| 457 | } else | 457 | } else |
| 458 | buffer = small_buf; | 458 | buffer = small_buf; |
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c index fae8e85af0ed..6bd9b691a463 100644 --- a/fs/smbfs/smbiod.c +++ b/fs/smbfs/smbiod.c | |||
| @@ -206,7 +206,7 @@ int smbiod_retry(struct smb_sb_info *server) | |||
| 206 | 206 | ||
| 207 | smb_close_socket(server); | 207 | smb_close_socket(server); |
| 208 | 208 | ||
| 209 | if (pid == 0) { | 209 | if (!pid) { |
| 210 | /* FIXME: this is fatal, umount? */ | 210 | /* FIXME: this is fatal, umount? */ |
| 211 | printk(KERN_ERR "smb_retry: no connection process\n"); | 211 | printk(KERN_ERR "smb_retry: no connection process\n"); |
| 212 | server->state = CONN_RETRIED; | 212 | server->state = CONN_RETRIED; |
diff --git a/include/asm-avr32/byteorder.h b/include/asm-avr32/byteorder.h index 402ff4125cdc..d77b48ba7338 100644 --- a/include/asm-avr32/byteorder.h +++ b/include/asm-avr32/byteorder.h | |||
| @@ -12,8 +12,14 @@ extern unsigned long __builtin_bswap_32(unsigned long x); | |||
| 12 | extern unsigned short __builtin_bswap_16(unsigned short x); | 12 | extern unsigned short __builtin_bswap_16(unsigned short x); |
| 13 | #endif | 13 | #endif |
| 14 | 14 | ||
| 15 | /* | ||
| 16 | * avr32-linux-gcc versions earlier than 4.2 improperly sign-extends | ||
| 17 | * the result. | ||
| 18 | */ | ||
| 19 | #if !(__GNUC__ == 4 && __GNUC_MINOR__ < 2) | ||
| 15 | #define __arch__swab32(x) __builtin_bswap_32(x) | 20 | #define __arch__swab32(x) __builtin_bswap_32(x) |
| 16 | #define __arch__swab16(x) __builtin_bswap_16(x) | 21 | #define __arch__swab16(x) __builtin_bswap_16(x) |
| 22 | #endif | ||
| 17 | 23 | ||
| 18 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | 24 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
| 19 | # define __BYTEORDER_HAS_U64__ | 25 | # define __BYTEORDER_HAS_U64__ |
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h index b400cea81487..2c57f4734746 100644 --- a/include/asm-frv/system.h +++ b/include/asm-frv/system.h | |||
| @@ -234,7 +234,7 @@ extern void free_initmem(void); | |||
| 234 | break; \ | 234 | break; \ |
| 235 | \ | 235 | \ |
| 236 | default: \ | 236 | default: \ |
| 237 | __xg_orig = 0; \ | 237 | __xg_orig = (__typeof__(__xg_orig))0; \ |
| 238 | asm volatile("break"); \ | 238 | asm volatile("break"); \ |
| 239 | break; \ | 239 | break; \ |
| 240 | } \ | 240 | } \ |
| @@ -259,7 +259,7 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new); | |||
| 259 | (__force uint32_t)__xg_test, \ | 259 | (__force uint32_t)__xg_test, \ |
| 260 | (__force uint32_t)__xg_new); break; \ | 260 | (__force uint32_t)__xg_new); break; \ |
| 261 | default: \ | 261 | default: \ |
| 262 | __xg_orig = 0; \ | 262 | __xg_orig = (__typeof__(__xg_orig))0; \ |
| 263 | asm volatile("break"); \ | 263 | asm volatile("break"); \ |
| 264 | break; \ | 264 | break; \ |
| 265 | } \ | 265 | } \ |
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index cb18af989645..5bb57bf2b9d7 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
| @@ -1786,6 +1786,7 @@ struct cpu_spec { | |||
| 1786 | char *cpu_name; | 1786 | char *cpu_name; |
| 1787 | unsigned char cpu_od; /* Set Config[OD] */ | 1787 | unsigned char cpu_od; /* Set Config[OD] */ |
| 1788 | unsigned char cpu_bclk; /* Enable BCLK switching */ | 1788 | unsigned char cpu_bclk; /* Enable BCLK switching */ |
| 1789 | unsigned char cpu_pll_wo; /* sys_cpupll reg. write-only */ | ||
| 1789 | }; | 1790 | }; |
| 1790 | 1791 | ||
| 1791 | extern struct cpu_spec cpu_specs[]; | 1792 | extern struct cpu_spec cpu_specs[]; |
diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h deleted file mode 100644 index 59fbfdc90dfb..000000000000 --- a/include/asm-sh/floppy.h +++ /dev/null | |||
| @@ -1,268 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Architecture specific parts of the Floppy driver | ||
| 3 | * include/asm-i386/floppy.h | ||
| 4 | * | ||
| 5 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 6 | * License. See the file "COPYING" in the main directory of this archive | ||
| 7 | * for more details. | ||
| 8 | * | ||
| 9 | * Copyright (C) 1995 | ||
| 10 | */ | ||
| 11 | #ifndef __ASM_SH_FLOPPY_H | ||
| 12 | #define __ASM_SH_FLOPPY_H | ||
| 13 | |||
| 14 | #include <linux/vmalloc.h> | ||
| 15 | |||
| 16 | |||
| 17 | /* | ||
| 18 | * The DMA channel used by the floppy controller cannot access data at | ||
| 19 | * addresses >= 16MB | ||
| 20 | * | ||
| 21 | * Went back to the 1MB limit, as some people had problems with the floppy | ||
| 22 | * driver otherwise. It doesn't matter much for performance anyway, as most | ||
| 23 | * floppy accesses go through the track buffer. | ||
| 24 | */ | ||
| 25 | #define _CROSS_64KB(a,s,vdma) \ | ||
| 26 | (!vdma && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)) | ||
| 27 | |||
| 28 | #define CROSS_64KB(a,s) _CROSS_64KB(a,s,use_virtual_dma & 1) | ||
| 29 | |||
| 30 | |||
| 31 | #define SW fd_routine[use_virtual_dma&1] | ||
| 32 | #define CSW fd_routine[can_use_virtual_dma & 1] | ||
| 33 | |||
| 34 | |||
| 35 | #define fd_inb(port) inb_p(port) | ||
| 36 | #define fd_outb(value,port) outb_p(value,port) | ||
| 37 | |||
| 38 | #define fd_request_dma() CSW._request_dma(FLOPPY_DMA,"floppy") | ||
| 39 | #define fd_free_dma() CSW._free_dma(FLOPPY_DMA) | ||
| 40 | #define fd_enable_irq() enable_irq(FLOPPY_IRQ) | ||
| 41 | #define fd_disable_irq() disable_irq(FLOPPY_IRQ) | ||
| 42 | #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) | ||
| 43 | #define fd_get_dma_residue() SW._get_dma_residue(FLOPPY_DMA) | ||
| 44 | #define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) | ||
| 45 | #define fd_dma_setup(addr, size, mode, io) SW._dma_setup(addr, size, mode, io) | ||
| 46 | |||
| 47 | #define FLOPPY_CAN_FALLBACK_ON_NODMA | ||
| 48 | |||
| 49 | static int virtual_dma_count; | ||
| 50 | static int virtual_dma_residue; | ||
| 51 | static char *virtual_dma_addr; | ||
| 52 | static int virtual_dma_mode; | ||
| 53 | static int doing_pdma; | ||
| 54 | |||
| 55 | static void floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) | ||
| 56 | { | ||
| 57 | register unsigned char st; | ||
| 58 | |||
| 59 | #undef TRACE_FLPY_INT | ||
| 60 | |||
| 61 | #ifdef TRACE_FLPY_INT | ||
| 62 | static int calls=0; | ||
| 63 | static int bytes=0; | ||
| 64 | static int dma_wait=0; | ||
| 65 | #endif | ||
| 66 | if(!doing_pdma) { | ||
| 67 | floppy_interrupt(irq, dev_id, regs); | ||
| 68 | return; | ||
| 69 | } | ||
| 70 | |||
| 71 | #ifdef TRACE_FLPY_INT | ||
| 72 | if(!calls) | ||
| 73 | bytes = virtual_dma_count; | ||
| 74 | #endif | ||
| 75 | |||
| 76 | { | ||
| 77 | register int lcount; | ||
| 78 | register char *lptr; | ||
| 79 | |||
| 80 | st = 1; | ||
| 81 | for(lcount=virtual_dma_count, lptr=virtual_dma_addr; | ||
| 82 | lcount; lcount--, lptr++) { | ||
| 83 | st=inb(virtual_dma_port+4) & 0xa0 ; | ||
| 84 | if(st != 0xa0) | ||
| 85 | break; | ||
| 86 | if(virtual_dma_mode) | ||
| 87 | outb_p(*lptr, virtual_dma_port+5); | ||
| 88 | else | ||
| 89 | *lptr = inb_p(virtual_dma_port+5); | ||
| 90 | } | ||
| 91 | virtual_dma_count = lcount; | ||
| 92 | virtual_dma_addr = lptr; | ||
| 93 | st = inb(virtual_dma_port+4); | ||
| 94 | } | ||
| 95 | |||
| 96 | #ifdef TRACE_FLPY_INT | ||
| 97 | calls++; | ||
| 98 | #endif | ||
| 99 | if(st == 0x20) | ||
| 100 | return; | ||
| 101 | if(!(st & 0x20)) { | ||
| 102 | virtual_dma_residue += virtual_dma_count; | ||
| 103 | virtual_dma_count=0; | ||
| 104 | #ifdef TRACE_FLPY_INT | ||
| 105 | printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n", | ||
| 106 | virtual_dma_count, virtual_dma_residue, calls, bytes, | ||
| 107 | dma_wait); | ||
| 108 | calls = 0; | ||
| 109 | dma_wait=0; | ||
| 110 | #endif | ||
| 111 | doing_pdma = 0; | ||
| 112 | floppy_interrupt(irq, dev_id, regs); | ||
| 113 | return; | ||
| 114 | } | ||
| 115 | #ifdef TRACE_FLPY_INT | ||
| 116 | if(!virtual_dma_count) | ||
| 117 | dma_wait++; | ||
| 118 | #endif | ||
| 119 | } | ||
| 120 | |||
| 121 | static void fd_disable_dma(void) | ||
| 122 | { | ||
| 123 | if(! (can_use_virtual_dma & 1)) | ||
| 124 | disable_dma(FLOPPY_DMA); | ||
| 125 | doing_pdma = 0; | ||
| 126 | virtual_dma_residue += virtual_dma_count; | ||
| 127 | virtual_dma_count=0; | ||
| 128 | } | ||
| 129 | |||
| 130 | static int vdma_request_dma(unsigned int dmanr, const char * device_id) | ||
| 131 | { | ||
| 132 | return 0; | ||
| 133 | } | ||
| 134 | |||
| 135 | static void vdma_nop(unsigned int dummy) | ||
| 136 | { | ||
| 137 | } | ||
| 138 | |||
| 139 | |||
| 140 | static int vdma_get_dma_residue(unsigned int dummy) | ||
| 141 | { | ||
| 142 | return virtual_dma_count + virtual_dma_residue; | ||
| 143 | } | ||
| 144 | |||
| 145 | |||
| 146 | static int fd_request_irq(void) | ||
| 147 | { | ||
| 148 | if(can_use_virtual_dma) | ||
| 149 | return request_irq(FLOPPY_IRQ, floppy_hardint, | ||
| 150 | IRQF_DISABLED, "floppy", NULL); | ||
| 151 | else | ||
| 152 | return request_irq(FLOPPY_IRQ, floppy_interrupt, | ||
| 153 | IRQF_DISABLED, "floppy", NULL); | ||
| 154 | } | ||
| 155 | |||
| 156 | static unsigned long dma_mem_alloc(unsigned long size) | ||
| 157 | { | ||
| 158 | return __get_dma_pages(GFP_KERNEL,get_order(size)); | ||
| 159 | } | ||
| 160 | |||
| 161 | |||
| 162 | static unsigned long vdma_mem_alloc(unsigned long size) | ||
| 163 | { | ||
| 164 | return (unsigned long) vmalloc(size); | ||
| 165 | |||
| 166 | } | ||
| 167 | |||
| 168 | #define nodma_mem_alloc(size) vdma_mem_alloc(size) | ||
| 169 | |||
| 170 | static void _fd_dma_mem_free(unsigned long addr, unsigned long size) | ||
| 171 | { | ||
| 172 | if((unsigned int) addr >= (unsigned int) high_memory) | ||
| 173 | return vfree((void *)addr); | ||
| 174 | else | ||
| 175 | free_pages(addr, get_order(size)); | ||
| 176 | } | ||
| 177 | |||
| 178 | #define fd_dma_mem_free(addr, size) _fd_dma_mem_free(addr, size) | ||
| 179 | |||
| 180 | static void _fd_chose_dma_mode(char *addr, unsigned long size) | ||
| 181 | { | ||
| 182 | if(can_use_virtual_dma == 2) { | ||
| 183 | if((unsigned int) addr >= (unsigned int) high_memory || | ||
| 184 | virt_to_phys(addr) >= 0x10000000) | ||
| 185 | use_virtual_dma = 1; | ||
| 186 | else | ||
| 187 | use_virtual_dma = 0; | ||
| 188 | } else { | ||
| 189 | use_virtual_dma = can_use_virtual_dma & 1; | ||
| 190 | } | ||
| 191 | } | ||
| 192 | |||
| 193 | #define fd_chose_dma_mode(addr, size) _fd_chose_dma_mode(addr, size) | ||
| 194 | |||
| 195 | |||
| 196 | static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
| 197 | { | ||
| 198 | doing_pdma = 1; | ||
| 199 | virtual_dma_port = io; | ||
| 200 | virtual_dma_mode = (mode == DMA_MODE_WRITE); | ||
| 201 | virtual_dma_addr = addr; | ||
| 202 | virtual_dma_count = size; | ||
| 203 | virtual_dma_residue = 0; | ||
| 204 | return 0; | ||
| 205 | } | ||
| 206 | |||
| 207 | static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
| 208 | { | ||
| 209 | #ifdef FLOPPY_SANITY_CHECK | ||
| 210 | if (CROSS_64KB(addr, size)) { | ||
| 211 | printk("DMA crossing 64-K boundary %p-%p\n", addr, addr+size); | ||
| 212 | return -1; | ||
| 213 | } | ||
| 214 | #endif | ||
| 215 | |||
| 216 | __flush_purge_region(addr, size); | ||
| 217 | |||
| 218 | /* actual, physical DMA */ | ||
| 219 | doing_pdma = 0; | ||
| 220 | clear_dma_ff(FLOPPY_DMA); | ||
| 221 | set_dma_mode(FLOPPY_DMA,mode); | ||
| 222 | set_dma_addr(FLOPPY_DMA,virt_to_phys(addr)); | ||
| 223 | set_dma_count(FLOPPY_DMA,size); | ||
| 224 | enable_dma(FLOPPY_DMA); | ||
| 225 | return 0; | ||
| 226 | } | ||
| 227 | |||
| 228 | static struct fd_routine_l { | ||
| 229 | int (*_request_dma)(unsigned int dmanr, const char * device_id); | ||
| 230 | void (*_free_dma)(unsigned int dmanr); | ||
| 231 | int (*_get_dma_residue)(unsigned int dummy); | ||
| 232 | unsigned long (*_dma_mem_alloc) (unsigned long size); | ||
| 233 | int (*_dma_setup)(char *addr, unsigned long size, int mode, int io); | ||
| 234 | } fd_routine[] = { | ||
| 235 | { | ||
| 236 | request_dma, | ||
| 237 | free_dma, | ||
| 238 | get_dma_residue, | ||
| 239 | dma_mem_alloc, | ||
| 240 | hard_dma_setup | ||
| 241 | }, | ||
| 242 | { | ||
| 243 | vdma_request_dma, | ||
| 244 | vdma_nop, | ||
| 245 | vdma_get_dma_residue, | ||
| 246 | vdma_mem_alloc, | ||
| 247 | vdma_dma_setup | ||
| 248 | } | ||
| 249 | }; | ||
| 250 | |||
| 251 | |||
| 252 | static int FDC1 = 0x3f0; | ||
| 253 | static int FDC2 = -1; | ||
| 254 | |||
| 255 | /* | ||
| 256 | * Floppy types are stored in the rtc's CMOS RAM and so rtc_lock | ||
| 257 | * is needed to prevent corrupted CMOS RAM in case "insmod floppy" | ||
| 258 | * coincides with another rtc CMOS user. Paul G. | ||
| 259 | */ | ||
| 260 | #define FLOPPY0_TYPE (4) | ||
| 261 | #define FLOPPY1_TYPE (0) | ||
| 262 | |||
| 263 | #define N_FDC 2 | ||
| 264 | #define N_DRIVE 8 | ||
| 265 | |||
| 266 | #define EXTRA_FLOPPY_PARAMS | ||
| 267 | |||
| 268 | #endif /* __ASM_SH_FLOPPY_H */ | ||
diff --git a/include/asm-sh/fpu.h b/include/asm-sh/fpu.h index f8429880a270..91462fea1507 100644 --- a/include/asm-sh/fpu.h +++ b/include/asm-sh/fpu.h | |||
| @@ -1,9 +1,8 @@ | |||
| 1 | #ifndef __ASM_SH_FPU_H | 1 | #ifndef __ASM_SH_FPU_H |
| 2 | #define __ASM_SH_FPU_H | 2 | #define __ASM_SH_FPU_H |
| 3 | 3 | ||
| 4 | #define SR_FD 0x00008000 | ||
| 5 | |||
| 6 | #ifndef __ASSEMBLY__ | 4 | #ifndef __ASSEMBLY__ |
| 5 | #include <linux/preempt.h> | ||
| 7 | #include <asm/ptrace.h> | 6 | #include <asm/ptrace.h> |
| 8 | 7 | ||
| 9 | #ifdef CONFIG_SH_FPU | 8 | #ifdef CONFIG_SH_FPU |
| @@ -21,25 +20,35 @@ struct task_struct; | |||
| 21 | 20 | ||
| 22 | extern void save_fpu(struct task_struct *__tsk, struct pt_regs *regs); | 21 | extern void save_fpu(struct task_struct *__tsk, struct pt_regs *regs); |
| 23 | #else | 22 | #else |
| 23 | |||
| 24 | #define release_fpu(regs) do { } while (0) | 24 | #define release_fpu(regs) do { } while (0) |
| 25 | #define grab_fpu(regs) do { } while (0) | 25 | #define grab_fpu(regs) do { } while (0) |
| 26 | #define save_fpu(tsk, regs) do { } while (0) | 26 | |
| 27 | static inline void save_fpu(struct task_struct *tsk, struct pt_regs *regs) | ||
| 28 | { | ||
| 29 | clear_tsk_thread_flag(tsk, TIF_USEDFPU); | ||
| 30 | } | ||
| 27 | #endif | 31 | #endif |
| 28 | 32 | ||
| 29 | extern int do_fpu_inst(unsigned short, struct pt_regs *); | 33 | extern int do_fpu_inst(unsigned short, struct pt_regs *); |
| 30 | 34 | ||
| 31 | #define unlazy_fpu(tsk, regs) do { \ | 35 | static inline void unlazy_fpu(struct task_struct *tsk, struct pt_regs *regs) |
| 32 | if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) { \ | 36 | { |
| 33 | save_fpu(tsk, regs); \ | 37 | preempt_disable(); |
| 34 | } \ | 38 | if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) |
| 35 | } while (0) | 39 | save_fpu(tsk, regs); |
| 36 | 40 | preempt_enable(); | |
| 37 | #define clear_fpu(tsk, regs) do { \ | 41 | } |
| 38 | if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) { \ | 42 | |
| 39 | clear_tsk_thread_flag(tsk, TIF_USEDFPU); \ | 43 | static inline void clear_fpu(struct task_struct *tsk, struct pt_regs *regs) |
| 40 | release_fpu(regs); \ | 44 | { |
| 41 | } \ | 45 | preempt_disable(); |
| 42 | } while (0) | 46 | if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) { |
| 47 | clear_tsk_thread_flag(tsk, TIF_USEDFPU); | ||
| 48 | release_fpu(regs); | ||
| 49 | } | ||
| 50 | preempt_enable(); | ||
| 51 | } | ||
| 43 | 52 | ||
| 44 | #endif /* __ASSEMBLY__ */ | 53 | #endif /* __ASSEMBLY__ */ |
| 45 | 54 | ||
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h index 19fe47c1ca17..ec707b98e5b9 100644 --- a/include/asm-sh/processor.h +++ b/include/asm-sh/processor.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __ASM_SH_PROCESSOR_H | 2 | #define __ASM_SH_PROCESSOR_H |
| 3 | 3 | ||
| 4 | #include <asm/cpu-features.h> | 4 | #include <asm/cpu-features.h> |
| 5 | #include <asm/fpu.h> | ||
| 6 | 5 | ||
| 7 | #ifndef __ASSEMBLY__ | 6 | #ifndef __ASSEMBLY__ |
| 8 | /* | 7 | /* |
diff --git a/include/asm-sh/processor_32.h b/include/asm-sh/processor_32.h index df2d5b039ef4..c09305d6a9d9 100644 --- a/include/asm-sh/processor_32.h +++ b/include/asm-sh/processor_32.h | |||
| @@ -70,6 +70,7 @@ extern struct sh_cpuinfo cpu_data[]; | |||
| 70 | */ | 70 | */ |
| 71 | #define SR_DSP 0x00001000 | 71 | #define SR_DSP 0x00001000 |
| 72 | #define SR_IMASK 0x000000f0 | 72 | #define SR_IMASK 0x000000f0 |
| 73 | #define SR_FD 0x00008000 | ||
| 73 | 74 | ||
| 74 | /* | 75 | /* |
| 75 | * FPU structure and data | 76 | * FPU structure and data |
diff --git a/include/asm-sh/processor_64.h b/include/asm-sh/processor_64.h index eda4bef448e9..88a2edf8fa5d 100644 --- a/include/asm-sh/processor_64.h +++ b/include/asm-sh/processor_64.h | |||
| @@ -112,6 +112,7 @@ extern struct sh_cpuinfo cpu_data[]; | |||
| 112 | #endif | 112 | #endif |
| 113 | 113 | ||
| 114 | #define SR_IMASK 0x000000f0 | 114 | #define SR_IMASK 0x000000f0 |
| 115 | #define SR_FD 0x00008000 | ||
| 115 | #define SR_SSTEP 0x08000000 | 116 | #define SR_SSTEP 0x08000000 |
| 116 | 117 | ||
| 117 | #ifndef __ASSEMBLY__ | 118 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h index 542421460a12..532975ecfe10 100644 --- a/include/asm-sparc64/cpudata.h +++ b/include/asm-sparc64/cpudata.h | |||
| @@ -86,6 +86,8 @@ extern struct trap_per_cpu trap_block[NR_CPUS]; | |||
| 86 | extern void init_cur_cpu_trap(struct thread_info *); | 86 | extern void init_cur_cpu_trap(struct thread_info *); |
| 87 | extern void setup_tba(void); | 87 | extern void setup_tba(void); |
| 88 | extern int ncpus_probed; | 88 | extern int ncpus_probed; |
| 89 | extern void __init cpu_probe(void); | ||
| 90 | extern const struct seq_operations cpuinfo_op; | ||
| 89 | 91 | ||
| 90 | extern unsigned long real_hard_smp_processor_id(void); | 92 | extern unsigned long real_hard_smp_processor_id(void); |
| 91 | 93 | ||
diff --git a/include/asm-sparc64/dcu.h b/include/asm-sparc64/dcu.h index ecbed2ae548f..0f704e106a1b 100644 --- a/include/asm-sparc64/dcu.h +++ b/include/asm-sparc64/dcu.h | |||
| @@ -1,26 +1,27 @@ | |||
| 1 | /* $Id: dcu.h,v 1.2 2001/03/01 23:23:33 davem Exp $ */ | ||
| 2 | #ifndef _SPARC64_DCU_H | 1 | #ifndef _SPARC64_DCU_H |
| 3 | #define _SPARC64_DCU_H | 2 | #define _SPARC64_DCU_H |
| 4 | 3 | ||
| 4 | #include <linux/const.h> | ||
| 5 | |||
| 5 | /* UltraSparc-III Data Cache Unit Control Register */ | 6 | /* UltraSparc-III Data Cache Unit Control Register */ |
| 6 | #define DCU_CP 0x0002000000000000 /* Physical Cache Enable w/o mmu*/ | 7 | #define DCU_CP _AC(0x0002000000000000,UL) /* Phys Cache Enable w/o mmu */ |
| 7 | #define DCU_CV 0x0001000000000000 /* Virtual Cache Enable w/o mmu */ | 8 | #define DCU_CV _AC(0x0001000000000000,UL) /* Virt Cache Enable w/o mmu */ |
| 8 | #define DCU_ME 0x0000800000000000 /* NC-store Merging Enable */ | 9 | #define DCU_ME _AC(0x0000800000000000,UL) /* NC-store Merging Enable */ |
| 9 | #define DCU_RE 0x0000400000000000 /* RAW bypass Enable */ | 10 | #define DCU_RE _AC(0x0000400000000000,UL) /* RAW bypass Enable */ |
| 10 | #define DCU_PE 0x0000200000000000 /* PCache Enable */ | 11 | #define DCU_PE _AC(0x0000200000000000,UL) /* PCache Enable */ |
| 11 | #define DCU_HPE 0x0000100000000000 /* HW prefetch Enable */ | 12 | #define DCU_HPE _AC(0x0000100000000000,UL) /* HW prefetch Enable */ |
| 12 | #define DCU_SPE 0x0000080000000000 /* SW prefetch Enable */ | 13 | #define DCU_SPE _AC(0x0000080000000000,UL) /* SW prefetch Enable */ |
| 13 | #define DCU_SL 0x0000040000000000 /* Secondary load steering Enab */ | 14 | #define DCU_SL _AC(0x0000040000000000,UL) /* Secondary ld-steering Enab*/ |
| 14 | #define DCU_WE 0x0000020000000000 /* WCache enable */ | 15 | #define DCU_WE _AC(0x0000020000000000,UL) /* WCache enable */ |
| 15 | #define DCU_PM 0x000001fe00000000 /* PA Watchpoint Byte Mask */ | 16 | #define DCU_PM _AC(0x000001fe00000000,UL) /* PA Watchpoint Byte Mask */ |
| 16 | #define DCU_VM 0x00000001fe000000 /* VA Watchpoint Byte Mask */ | 17 | #define DCU_VM _AC(0x00000001fe000000,UL) /* VA Watchpoint Byte Mask */ |
| 17 | #define DCU_PR 0x0000000001000000 /* PA Watchpoint Read Enable */ | 18 | #define DCU_PR _AC(0x0000000001000000,UL) /* PA Watchpoint Read Enable */ |
| 18 | #define DCU_PW 0x0000000000800000 /* PA Watchpoint Write Enable */ | 19 | #define DCU_PW _AC(0x0000000000800000,UL) /* PA Watchpoint Write Enable*/ |
| 19 | #define DCU_VR 0x0000000000400000 /* VA Watchpoint Read Enable */ | 20 | #define DCU_VR _AC(0x0000000000400000,UL) /* VA Watchpoint Read Enable */ |
| 20 | #define DCU_VW 0x0000000000200000 /* VA Watchpoint Write Enable */ | 21 | #define DCU_VW _AC(0x0000000000200000,UL) /* VA Watchpoint Write Enable*/ |
| 21 | #define DCU_DM 0x0000000000000008 /* DMMU Enable */ | 22 | #define DCU_DM _AC(0x0000000000000008,UL) /* DMMU Enable */ |
| 22 | #define DCU_IM 0x0000000000000004 /* IMMU Enable */ | 23 | #define DCU_IM _AC(0x0000000000000004,UL) /* IMMU Enable */ |
| 23 | #define DCU_DC 0x0000000000000002 /* Data Cache Enable */ | 24 | #define DCU_DC _AC(0x0000000000000002,UL) /* Data Cache Enable */ |
| 24 | #define DCU_IC 0x0000000000000001 /* Instruction Cache Enable */ | 25 | #define DCU_IC _AC(0x0000000000000001,UL) /* Instruction Cache Enable */ |
| 25 | 26 | ||
| 26 | #endif /* _SPARC64_DCU_H */ | 27 | #endif /* _SPARC64_DCU_H */ |
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h index 30cb76b47be1..0bb9bf531745 100644 --- a/include/asm-sparc64/irq.h +++ b/include/asm-sparc64/irq.h | |||
| @@ -64,6 +64,7 @@ extern unsigned char virt_irq_alloc(unsigned int dev_handle, | |||
| 64 | extern void virt_irq_free(unsigned int virt_irq); | 64 | extern void virt_irq_free(unsigned int virt_irq); |
| 65 | #endif | 65 | #endif |
| 66 | 66 | ||
| 67 | extern void __init init_IRQ(void); | ||
| 67 | extern void fixup_irqs(void); | 68 | extern void fixup_irqs(void); |
| 68 | 69 | ||
| 69 | static inline void set_softint(unsigned long bits) | 70 | static inline void set_softint(unsigned long bits) |
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index 3167ccff64f8..549e45266b68 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h | |||
| @@ -23,9 +23,9 @@ | |||
| 23 | #include <asm/page.h> | 23 | #include <asm/page.h> |
| 24 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
| 25 | 25 | ||
| 26 | /* The kernel image occupies 0x4000000 to 0x1000000 (4MB --> 32MB). | 26 | /* The kernel image occupies 0x4000000 to 0x6000000 (4MB --> 96MB). |
| 27 | * The page copy blockops can use 0x2000000 to 0x4000000. | 27 | * The page copy blockops can use 0x6000000 to 0x8000000. |
| 28 | * The TSB is mapped in the 0x4000000 to 0x6000000 range. | 28 | * The TSB is mapped in the 0x8000000 to 0xa000000 range. |
| 29 | * The PROM resides in an area spanning 0xf0000000 to 0x100000000. | 29 | * The PROM resides in an area spanning 0xf0000000 to 0x100000000. |
| 30 | * The vmalloc area spans 0x100000000 to 0x200000000. | 30 | * The vmalloc area spans 0x100000000 to 0x200000000. |
| 31 | * Since modules need to be in the lowest 32-bits of the address space, | 31 | * Since modules need to be in the lowest 32-bits of the address space, |
| @@ -33,8 +33,8 @@ | |||
| 33 | * There is a single static kernel PMD which maps from 0x0 to address | 33 | * There is a single static kernel PMD which maps from 0x0 to address |
| 34 | * 0x400000000. | 34 | * 0x400000000. |
| 35 | */ | 35 | */ |
| 36 | #define TLBTEMP_BASE _AC(0x0000000002000000,UL) | 36 | #define TLBTEMP_BASE _AC(0x0000000006000000,UL) |
| 37 | #define TSBMAP_BASE _AC(0x0000000004000000,UL) | 37 | #define TSBMAP_BASE _AC(0x0000000008000000,UL) |
| 38 | #define MODULES_VADDR _AC(0x0000000010000000,UL) | 38 | #define MODULES_VADDR _AC(0x0000000010000000,UL) |
| 39 | #define MODULES_LEN _AC(0x00000000e0000000,UL) | 39 | #define MODULES_LEN _AC(0x00000000e0000000,UL) |
| 40 | #define MODULES_END _AC(0x00000000f0000000,UL) | 40 | #define MODULES_END _AC(0x00000000f0000000,UL) |
| @@ -761,6 +761,8 @@ extern unsigned long get_fb_unmapped_area(struct file *filp, unsigned long, | |||
| 761 | extern void pgtable_cache_init(void); | 761 | extern void pgtable_cache_init(void); |
| 762 | extern void sun4v_register_fault_status(void); | 762 | extern void sun4v_register_fault_status(void); |
| 763 | extern void sun4v_ktsb_register(void); | 763 | extern void sun4v_ktsb_register(void); |
| 764 | extern void __init cheetah_ecache_flush_init(void); | ||
| 765 | extern void sun4v_patch_tlb_handlers(void); | ||
| 764 | 766 | ||
| 765 | extern unsigned long cmdline_memory_size; | 767 | extern unsigned long cmdline_memory_size; |
| 766 | 768 | ||
diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h index 8da484c19822..885b6a1dcae4 100644 --- a/include/asm-sparc64/processor.h +++ b/include/asm-sparc64/processor.h | |||
| @@ -37,6 +37,9 @@ | |||
| 37 | #endif | 37 | #endif |
| 38 | 38 | ||
| 39 | #define TASK_SIZE ((unsigned long)-VPTE_SIZE) | 39 | #define TASK_SIZE ((unsigned long)-VPTE_SIZE) |
| 40 | #define TASK_SIZE_OF(tsk) \ | ||
| 41 | (test_tsk_thread_flag(tsk,TIF_32BIT) ? \ | ||
| 42 | (1UL << 32UL) : TASK_SIZE) | ||
| 40 | #ifdef __KERNEL__ | 43 | #ifdef __KERNEL__ |
| 41 | 44 | ||
| 42 | #define STACK_TOP32 ((1UL << 32UL) - PAGE_SIZE) | 45 | #define STACK_TOP32 ((1UL << 32UL) - PAGE_SIZE) |
diff --git a/include/asm-sparc64/stacktrace.h b/include/asm-sparc64/stacktrace.h new file mode 100644 index 000000000000..6cee39adf6d6 --- /dev/null +++ b/include/asm-sparc64/stacktrace.h | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | #ifndef _SPARC64_STACKTRACE_H | ||
| 2 | #define _SPARC64_STACKTRACE_H | ||
| 3 | |||
| 4 | extern void stack_trace_flush(void); | ||
| 5 | |||
| 6 | #endif /* _SPARC64_STACKTRACE_H */ | ||
diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h index ccbd69448866..5b779fd1f788 100644 --- a/include/asm-sparc64/timer.h +++ b/include/asm-sparc64/timer.h | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | /* $Id: timer.h,v 1.3 2000/05/09 17:40:15 davem Exp $ | 1 | /* timer.h: System timer definitions for sun5. |
| 2 | * timer.h: System timer definitions for sun5. | ||
| 3 | * | 2 | * |
| 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1997, 2008 David S. Miller (davem@davemloft.net) |
| 5 | */ | 4 | */ |
| 6 | 5 | ||
| 7 | #ifndef _SPARC64_TIMER_H | 6 | #ifndef _SPARC64_TIMER_H |
| 8 | #define _SPARC64_TIMER_H | 7 | #define _SPARC64_TIMER_H |
| 9 | 8 | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | 10 | #include <linux/init.h> | |
| 12 | 11 | ||
| 13 | struct sparc64_tick_ops { | 12 | struct sparc64_tick_ops { |
| 14 | unsigned long (*get_tick)(void); | 13 | unsigned long (*get_tick)(void); |
| @@ -25,5 +24,7 @@ struct sparc64_tick_ops { | |||
| 25 | extern struct sparc64_tick_ops *tick_ops; | 24 | extern struct sparc64_tick_ops *tick_ops; |
| 26 | 25 | ||
| 27 | extern unsigned long sparc64_get_clock_tick(unsigned int cpu); | 26 | extern unsigned long sparc64_get_clock_tick(unsigned int cpu); |
| 27 | extern void __devinit setup_sparc64_timer(void); | ||
| 28 | extern void __init time_init(void); | ||
| 28 | 29 | ||
| 29 | #endif /* _SPARC64_TIMER_H */ | 30 | #endif /* _SPARC64_TIMER_H */ |
diff --git a/include/asm-x86/lguest_hcall.h b/include/asm-x86/lguest_hcall.h index 758b9a5d4539..f239e7069cab 100644 --- a/include/asm-x86/lguest_hcall.h +++ b/include/asm-x86/lguest_hcall.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #ifndef __ASSEMBLY__ | 27 | #ifndef __ASSEMBLY__ |
| 28 | #include <asm/hw_irq.h> | 28 | #include <asm/hw_irq.h> |
| 29 | 29 | ||
| 30 | /*G:031 First, how does our Guest contact the Host to ask for privileged | 30 | /*G:031 But first, how does our Guest contact the Host to ask for privileged |
| 31 | * operations? There are two ways: the direct way is to make a "hypercall", | 31 | * operations? There are two ways: the direct way is to make a "hypercall", |
| 32 | * to make requests of the Host Itself. | 32 | * to make requests of the Host Itself. |
| 33 | * | 33 | * |
diff --git a/include/asm-x86/mach-rdc321x/gpio.h b/include/asm-x86/mach-rdc321x/gpio.h index db31b929b990..acce0b7d397b 100644 --- a/include/asm-x86/mach-rdc321x/gpio.h +++ b/include/asm-x86/mach-rdc321x/gpio.h | |||
| @@ -5,19 +5,20 @@ extern int rdc_gpio_get_value(unsigned gpio); | |||
| 5 | extern void rdc_gpio_set_value(unsigned gpio, int value); | 5 | extern void rdc_gpio_set_value(unsigned gpio, int value); |
| 6 | extern int rdc_gpio_direction_input(unsigned gpio); | 6 | extern int rdc_gpio_direction_input(unsigned gpio); |
| 7 | extern int rdc_gpio_direction_output(unsigned gpio, int value); | 7 | extern int rdc_gpio_direction_output(unsigned gpio, int value); |
| 8 | 8 | extern int rdc_gpio_request(unsigned gpio, const char *label); | |
| 9 | extern void rdc_gpio_free(unsigned gpio); | ||
| 10 | extern void __init rdc321x_gpio_setup(void); | ||
| 9 | 11 | ||
| 10 | /* Wrappers for the arch-neutral GPIO API */ | 12 | /* Wrappers for the arch-neutral GPIO API */ |
| 11 | 13 | ||
| 12 | static inline int gpio_request(unsigned gpio, const char *label) | 14 | static inline int gpio_request(unsigned gpio, const char *label) |
| 13 | { | 15 | { |
| 14 | /* Not yet implemented */ | 16 | return rdc_gpio_request(gpio, label); |
| 15 | return 0; | ||
| 16 | } | 17 | } |
| 17 | 18 | ||
| 18 | static inline void gpio_free(unsigned gpio) | 19 | static inline void gpio_free(unsigned gpio) |
| 19 | { | 20 | { |
| 20 | /* Not yet implemented */ | 21 | rdc_gpio_free(gpio); |
| 21 | } | 22 | } |
| 22 | 23 | ||
| 23 | static inline int gpio_direction_input(unsigned gpio) | 24 | static inline int gpio_direction_input(unsigned gpio) |
diff --git a/include/asm-x86/mach-rdc321x/rdc321x_defs.h b/include/asm-x86/mach-rdc321x/rdc321x_defs.h index 838ba8f64fd3..c8e9c8bed3d0 100644 --- a/include/asm-x86/mach-rdc321x/rdc321x_defs.h +++ b/include/asm-x86/mach-rdc321x/rdc321x_defs.h | |||
| @@ -3,4 +3,10 @@ | |||
| 3 | /* General purpose configuration and data registers */ | 3 | /* General purpose configuration and data registers */ |
| 4 | #define RDC3210_CFGREG_ADDR 0x0CF8 | 4 | #define RDC3210_CFGREG_ADDR 0x0CF8 |
| 5 | #define RDC3210_CFGREG_DATA 0x0CFC | 5 | #define RDC3210_CFGREG_DATA 0x0CFC |
| 6 | #define RDC_MAX_GPIO 0x3A | 6 | |
| 7 | #define RDC321X_GPIO_CTRL_REG1 0x48 | ||
| 8 | #define RDC321X_GPIO_CTRL_REG2 0x84 | ||
| 9 | #define RDC321X_GPIO_DATA_REG1 0x4c | ||
| 10 | #define RDC321X_GPIO_DATA_REG2 0x88 | ||
| 11 | |||
| 12 | #define RDC321X_MAX_GPIO 58 | ||
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 174b87738714..9cf472aeb9ce 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h | |||
| @@ -85,6 +85,7 @@ extern pteval_t __PAGE_KERNEL, __PAGE_KERNEL_EXEC; | |||
| 85 | #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW) | 85 | #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW) |
| 86 | #define __PAGE_KERNEL_EXEC_NOCACHE (__PAGE_KERNEL_EXEC | _PAGE_PCD | _PAGE_PWT) | 86 | #define __PAGE_KERNEL_EXEC_NOCACHE (__PAGE_KERNEL_EXEC | _PAGE_PCD | _PAGE_PWT) |
| 87 | #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT) | 87 | #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT) |
| 88 | #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD) | ||
| 88 | #define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER) | 89 | #define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER) |
| 89 | #define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT) | 90 | #define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT) |
| 90 | #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE) | 91 | #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE) |
| @@ -101,6 +102,7 @@ extern pteval_t __PAGE_KERNEL, __PAGE_KERNEL_EXEC; | |||
| 101 | #define PAGE_KERNEL_EXEC MAKE_GLOBAL(__PAGE_KERNEL_EXEC) | 102 | #define PAGE_KERNEL_EXEC MAKE_GLOBAL(__PAGE_KERNEL_EXEC) |
| 102 | #define PAGE_KERNEL_RX MAKE_GLOBAL(__PAGE_KERNEL_RX) | 103 | #define PAGE_KERNEL_RX MAKE_GLOBAL(__PAGE_KERNEL_RX) |
| 103 | #define PAGE_KERNEL_NOCACHE MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE) | 104 | #define PAGE_KERNEL_NOCACHE MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE) |
| 105 | #define PAGE_KERNEL_UC_MINUS MAKE_GLOBAL(__PAGE_KERNEL_UC_MINUS) | ||
| 104 | #define PAGE_KERNEL_EXEC_NOCACHE MAKE_GLOBAL(__PAGE_KERNEL_EXEC_NOCACHE) | 106 | #define PAGE_KERNEL_EXEC_NOCACHE MAKE_GLOBAL(__PAGE_KERNEL_EXEC_NOCACHE) |
| 105 | #define PAGE_KERNEL_LARGE MAKE_GLOBAL(__PAGE_KERNEL_LARGE) | 107 | #define PAGE_KERNEL_LARGE MAKE_GLOBAL(__PAGE_KERNEL_LARGE) |
| 106 | #define PAGE_KERNEL_LARGE_EXEC MAKE_GLOBAL(__PAGE_KERNEL_LARGE_EXEC) | 108 | #define PAGE_KERNEL_LARGE_EXEC MAKE_GLOBAL(__PAGE_KERNEL_LARGE_EXEC) |
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 4108b38ebb16..4a446a19295e 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -195,7 +195,6 @@ unifdef-y += ethtool.h | |||
| 195 | unifdef-y += eventpoll.h | 195 | unifdef-y += eventpoll.h |
| 196 | unifdef-y += signalfd.h | 196 | unifdef-y += signalfd.h |
| 197 | unifdef-y += ext2_fs.h | 197 | unifdef-y += ext2_fs.h |
| 198 | unifdef-y += ext3_fs.h | ||
| 199 | unifdef-y += fb.h | 198 | unifdef-y += fb.h |
| 200 | unifdef-y += fcntl.h | 199 | unifdef-y += fcntl.h |
| 201 | unifdef-y += filter.h | 200 | unifdef-y += filter.h |
| @@ -248,7 +247,6 @@ unifdef-y += isdn.h | |||
| 248 | unifdef-y += isdnif.h | 247 | unifdef-y += isdnif.h |
| 249 | unifdef-y += isdn_divertif.h | 248 | unifdef-y += isdn_divertif.h |
| 250 | unifdef-y += isdn_ppp.h | 249 | unifdef-y += isdn_ppp.h |
| 251 | unifdef-y += jbd.h | ||
| 252 | unifdef-y += joystick.h | 250 | unifdef-y += joystick.h |
| 253 | unifdef-y += kdev_t.h | 251 | unifdef-y += kdev_t.h |
| 254 | unifdef-y += kd.h | 252 | unifdef-y += kd.h |
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 69c1edb9fe54..40d54731de7e 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h | |||
| @@ -65,6 +65,46 @@ static inline __u32 ror32(__u32 word, unsigned int shift) | |||
| 65 | return (word >> shift) | (word << (32 - shift)); | 65 | return (word >> shift) | (word << (32 - shift)); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | /** | ||
| 69 | * rol16 - rotate a 16-bit value left | ||
| 70 | * @word: value to rotate | ||
| 71 | * @shift: bits to roll | ||
| 72 | */ | ||
| 73 | static inline __u16 rol16(__u16 word, unsigned int shift) | ||
| 74 | { | ||
| 75 | return (word << shift) | (word >> (16 - shift)); | ||
| 76 | } | ||
| 77 | |||
| 78 | /** | ||
| 79 | * ror16 - rotate a 16-bit value right | ||
| 80 | * @word: value to rotate | ||
| 81 | * @shift: bits to roll | ||
| 82 | */ | ||
| 83 | static inline __u16 ror16(__u16 word, unsigned int shift) | ||
| 84 | { | ||
| 85 | return (word >> shift) | (word << (16 - shift)); | ||
| 86 | } | ||
| 87 | |||
| 88 | /** | ||
| 89 | * rol8 - rotate an 8-bit value left | ||
| 90 | * @word: value to rotate | ||
| 91 | * @shift: bits to roll | ||
| 92 | */ | ||
| 93 | static inline __u8 rol8(__u8 word, unsigned int shift) | ||
| 94 | { | ||
| 95 | return (word << shift) | (word >> (8 - shift)); | ||
| 96 | } | ||
| 97 | |||
| 98 | /** | ||
| 99 | * ror8 - rotate an 8-bit value right | ||
| 100 | * @word: value to rotate | ||
| 101 | * @shift: bits to roll | ||
| 102 | */ | ||
| 103 | static inline __u8 ror8(__u8 word, unsigned int shift) | ||
| 104 | { | ||
| 105 | return (word >> shift) | (word << (8 - shift)); | ||
| 106 | } | ||
| 107 | |||
| 68 | static inline unsigned fls_long(unsigned long l) | 108 | static inline unsigned fls_long(unsigned long l) |
| 69 | { | 109 | { |
| 70 | if (sizeof(l) == 4) | 110 | if (sizeof(l) == 4) |
diff --git a/include/linux/compat.h b/include/linux/compat.h index a671dbff7a1f..8fa7857e153b 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
| @@ -192,8 +192,8 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, | |||
| 192 | struct compat_timeval __user *tvp); | 192 | struct compat_timeval __user *tvp); |
| 193 | 193 | ||
| 194 | asmlinkage long compat_sys_wait4(compat_pid_t pid, | 194 | asmlinkage long compat_sys_wait4(compat_pid_t pid, |
| 195 | compat_uint_t *stat_addr, int options, | 195 | compat_uint_t __user *stat_addr, int options, |
| 196 | struct compat_rusage *ru); | 196 | struct compat_rusage __user *ru); |
| 197 | 197 | ||
| 198 | #define BITS_PER_COMPAT_LONG (8*sizeof(compat_long_t)) | 198 | #define BITS_PER_COMPAT_LONG (8*sizeof(compat_long_t)) |
| 199 | 199 | ||
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 6b72a4584086..51e6b1e520e6 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h | |||
| @@ -38,8 +38,8 @@ struct cpuidle_state { | |||
| 38 | unsigned int power_usage; /* in mW */ | 38 | unsigned int power_usage; /* in mW */ |
| 39 | unsigned int target_residency; /* in US */ | 39 | unsigned int target_residency; /* in US */ |
| 40 | 40 | ||
| 41 | unsigned int usage; | 41 | unsigned long long usage; |
| 42 | unsigned int time; /* in US */ | 42 | unsigned long long time; /* in US */ |
| 43 | 43 | ||
| 44 | int (*enter) (struct cpuidle_device *dev, | 44 | int (*enter) (struct cpuidle_device *dev, |
| 45 | struct cpuidle_state *state); | 45 | struct cpuidle_state *state); |
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 261e43a4c873..34d440698293 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -423,7 +423,7 @@ void dma_async_device_unregister(struct dma_device *device); | |||
| 423 | /* --- Helper iov-locking functions --- */ | 423 | /* --- Helper iov-locking functions --- */ |
| 424 | 424 | ||
| 425 | struct dma_page_list { | 425 | struct dma_page_list { |
| 426 | char *base_address; | 426 | char __user *base_address; |
| 427 | int nr_pages; | 427 | int nr_pages; |
| 428 | struct page **pages; | 428 | struct page **pages; |
| 429 | }; | 429 | }; |
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 49829988bfa0..897f723bd222 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h | |||
| @@ -72,6 +72,13 @@ | |||
| 72 | #define in_softirq() (softirq_count()) | 72 | #define in_softirq() (softirq_count()) |
| 73 | #define in_interrupt() (irq_count()) | 73 | #define in_interrupt() (irq_count()) |
| 74 | 74 | ||
| 75 | /* | ||
| 76 | * Are we running in atomic context? WARNING: this macro cannot | ||
| 77 | * always detect atomic context; in particular, it cannot know about | ||
| 78 | * held spinlocks in non-preemptible kernels. Thus it should not be | ||
| 79 | * used in the general case to determine whether sleeping is possible. | ||
| 80 | * Do not use in_atomic() in driver code. | ||
| 81 | */ | ||
| 75 | #define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != 0) | 82 | #define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != 0) |
| 76 | 83 | ||
| 77 | #ifdef CONFIG_PREEMPT | 84 | #ifdef CONFIG_PREEMPT |
diff --git a/include/linux/ide.h b/include/linux/ide.h index a3b69c10d667..bc26b2f27359 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <asm/semaphore.h> | 26 | #include <asm/semaphore.h> |
| 27 | #include <asm/mutex.h> | 27 | #include <asm/mutex.h> |
| 28 | 28 | ||
| 29 | #if defined(CRIS) || defined(FRV) | 29 | #if defined(CONFIG_CRIS) || defined(CONFIG_FRV) |
| 30 | # define SUPPORT_VLB_SYNC 0 | 30 | # define SUPPORT_VLB_SYNC 0 |
| 31 | #else | 31 | #else |
| 32 | # define SUPPORT_VLB_SYNC 1 | 32 | # define SUPPORT_VLB_SYNC 1 |
diff --git a/include/linux/input.h b/include/linux/input.h index 1bdc39a8c76c..cae2c35d1206 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -1227,12 +1227,13 @@ void input_free_device(struct input_dev *dev); | |||
| 1227 | 1227 | ||
| 1228 | static inline struct input_dev *input_get_device(struct input_dev *dev) | 1228 | static inline struct input_dev *input_get_device(struct input_dev *dev) |
| 1229 | { | 1229 | { |
| 1230 | return to_input_dev(get_device(&dev->dev)); | 1230 | return dev ? to_input_dev(get_device(&dev->dev)) : NULL; |
| 1231 | } | 1231 | } |
| 1232 | 1232 | ||
| 1233 | static inline void input_put_device(struct input_dev *dev) | 1233 | static inline void input_put_device(struct input_dev *dev) |
| 1234 | { | 1234 | { |
| 1235 | put_device(&dev->dev); | 1235 | if (dev) |
| 1236 | put_device(&dev->dev); | ||
| 1236 | } | 1237 | } |
| 1237 | 1238 | ||
| 1238 | static inline void *input_get_drvdata(struct input_dev *dev) | 1239 | static inline void *input_get_drvdata(struct input_dev *dev) |
diff --git a/include/linux/lguest_launcher.h b/include/linux/lguest_launcher.h index 589be3e1f3ac..e7217dc58f39 100644 --- a/include/linux/lguest_launcher.h +++ b/include/linux/lguest_launcher.h | |||
| @@ -16,6 +16,10 @@ | |||
| 16 | * a new device, we simply need to write a new virtio driver and create support | 16 | * a new device, we simply need to write a new virtio driver and create support |
| 17 | * for it in the Launcher: this code won't need to change. | 17 | * for it in the Launcher: this code won't need to change. |
| 18 | * | 18 | * |
| 19 | * Virtio devices are also used by kvm, so we can simply reuse their optimized | ||
| 20 | * device drivers. And one day when everyone uses virtio, my plan will be | ||
| 21 | * complete. Bwahahahah! | ||
| 22 | * | ||
| 19 | * Devices are described by a simplified ID, a status byte, and some "config" | 23 | * Devices are described by a simplified ID, a status byte, and some "config" |
| 20 | * bytes which describe this device's configuration. This is placed by the | 24 | * bytes which describe this device's configuration. This is placed by the |
| 21 | * Launcher just above the top of physical memory: | 25 | * Launcher just above the top of physical memory: |
| @@ -26,7 +30,7 @@ struct lguest_device_desc { | |||
| 26 | /* The number of virtqueues (first in config array) */ | 30 | /* The number of virtqueues (first in config array) */ |
| 27 | __u8 num_vq; | 31 | __u8 num_vq; |
| 28 | /* The number of bytes of feature bits. Multiply by 2: one for host | 32 | /* The number of bytes of feature bits. Multiply by 2: one for host |
| 29 | * features and one for guest acknowledgements. */ | 33 | * features and one for Guest acknowledgements. */ |
| 30 | __u8 feature_len; | 34 | __u8 feature_len; |
| 31 | /* The number of bytes of the config array after virtqueues. */ | 35 | /* The number of bytes of the config array after virtqueues. */ |
| 32 | __u8 config_len; | 36 | __u8 config_len; |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 269cdba09578..b064bfeb69ee 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -295,6 +295,7 @@ enum { | |||
| 295 | ATA_EH_SOFTRESET = (1 << 1), | 295 | ATA_EH_SOFTRESET = (1 << 1), |
| 296 | ATA_EH_HARDRESET = (1 << 2), | 296 | ATA_EH_HARDRESET = (1 << 2), |
| 297 | ATA_EH_ENABLE_LINK = (1 << 3), | 297 | ATA_EH_ENABLE_LINK = (1 << 3), |
| 298 | ATA_EH_LPM = (1 << 4), /* link power management action */ | ||
| 298 | 299 | ||
| 299 | ATA_EH_RESET_MASK = ATA_EH_SOFTRESET | ATA_EH_HARDRESET, | 300 | ATA_EH_RESET_MASK = ATA_EH_SOFTRESET | ATA_EH_HARDRESET, |
| 300 | ATA_EH_PERDEV_MASK = ATA_EH_REVALIDATE, | 301 | ATA_EH_PERDEV_MASK = ATA_EH_REVALIDATE, |
| @@ -304,7 +305,6 @@ enum { | |||
| 304 | ATA_EHI_RESUME_LINK = (1 << 1), /* resume link (reset modifier) */ | 305 | ATA_EHI_RESUME_LINK = (1 << 1), /* resume link (reset modifier) */ |
| 305 | ATA_EHI_NO_AUTOPSY = (1 << 2), /* no autopsy */ | 306 | ATA_EHI_NO_AUTOPSY = (1 << 2), /* no autopsy */ |
| 306 | ATA_EHI_QUIET = (1 << 3), /* be quiet */ | 307 | ATA_EHI_QUIET = (1 << 3), /* be quiet */ |
| 307 | ATA_EHI_LPM = (1 << 4), /* link power management action */ | ||
| 308 | 308 | ||
| 309 | ATA_EHI_DID_SOFTRESET = (1 << 16), /* already soft-reset this port */ | 309 | ATA_EHI_DID_SOFTRESET = (1 << 16), /* already soft-reset this port */ |
| 310 | ATA_EHI_DID_HARDRESET = (1 << 17), /* already soft-reset this port */ | 310 | ATA_EHI_DID_HARDRESET = (1 << 17), /* already soft-reset this port */ |
diff --git a/include/linux/mount.h b/include/linux/mount.h index 6d3047d8c91c..5ee2df217cdf 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h | |||
| @@ -61,6 +61,7 @@ struct vfsmount { | |||
| 61 | atomic_t mnt_count; | 61 | atomic_t mnt_count; |
| 62 | int mnt_expiry_mark; /* true if marked for expiry */ | 62 | int mnt_expiry_mark; /* true if marked for expiry */ |
| 63 | int mnt_pinned; | 63 | int mnt_pinned; |
| 64 | int mnt_ghosts; | ||
| 64 | }; | 65 | }; |
| 65 | 66 | ||
| 66 | static inline struct vfsmount *mntget(struct vfsmount *mnt) | 67 | static inline struct vfsmount *mntget(struct vfsmount *mnt) |
| @@ -98,7 +99,6 @@ extern int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd, | |||
| 98 | int mnt_flags, struct list_head *fslist); | 99 | int mnt_flags, struct list_head *fslist); |
| 99 | 100 | ||
| 100 | extern void mark_mounts_for_expiry(struct list_head *mounts); | 101 | extern void mark_mounts_for_expiry(struct list_head *mounts); |
| 101 | extern void shrink_submounts(struct vfsmount *mountpoint, struct list_head *mounts); | ||
| 102 | 102 | ||
| 103 | extern spinlock_t vfsmount_lock; | 103 | extern spinlock_t vfsmount_lock; |
| 104 | extern dev_t name_to_dev_t(char *name); | 104 | extern dev_t name_to_dev_t(char *name); |
diff --git a/include/linux/sched.h b/include/linux/sched.h index fed07d03364e..6a1e7afb099b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1541,6 +1541,12 @@ static inline void idle_task_exit(void) {} | |||
| 1541 | 1541 | ||
| 1542 | extern void sched_idle_next(void); | 1542 | extern void sched_idle_next(void); |
| 1543 | 1543 | ||
| 1544 | #if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP) | ||
| 1545 | extern void wake_up_idle_cpu(int cpu); | ||
| 1546 | #else | ||
| 1547 | static inline void wake_up_idle_cpu(int cpu) { } | ||
| 1548 | #endif | ||
| 1549 | |||
| 1544 | #ifdef CONFIG_SCHED_DEBUG | 1550 | #ifdef CONFIG_SCHED_DEBUG |
| 1545 | extern unsigned int sysctl_sched_latency; | 1551 | extern unsigned int sysctl_sched_latency; |
| 1546 | extern unsigned int sysctl_sched_min_granularity; | 1552 | extern unsigned int sysctl_sched_min_granularity; |
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index ebbfb509822e..64a5f0120b52 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
| @@ -218,6 +218,10 @@ extern unsigned long neigh_rand_reach_time(unsigned long base); | |||
| 218 | extern void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p, | 218 | extern void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p, |
| 219 | struct sk_buff *skb); | 219 | struct sk_buff *skb); |
| 220 | extern struct pneigh_entry *pneigh_lookup(struct neigh_table *tbl, struct net *net, const void *key, struct net_device *dev, int creat); | 220 | extern struct pneigh_entry *pneigh_lookup(struct neigh_table *tbl, struct net *net, const void *key, struct net_device *dev, int creat); |
| 221 | extern struct pneigh_entry *__pneigh_lookup(struct neigh_table *tbl, | ||
| 222 | struct net *net, | ||
| 223 | const void *key, | ||
| 224 | struct net_device *dev); | ||
| 221 | extern int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *key, struct net_device *dev); | 225 | extern int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *key, struct net_device *dev); |
| 222 | 226 | ||
| 223 | extern void neigh_app_ns(struct neighbour *n); | 227 | extern void neigh_app_ns(struct neighbour *n); |
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 619c53bc3cd2..0d255ae008b6 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
| @@ -204,6 +204,7 @@ struct xfrm_state | |||
| 204 | * transformer. */ | 204 | * transformer. */ |
| 205 | const struct xfrm_type *type; | 205 | const struct xfrm_type *type; |
| 206 | struct xfrm_mode *inner_mode; | 206 | struct xfrm_mode *inner_mode; |
| 207 | struct xfrm_mode *inner_mode_iaf; | ||
| 207 | struct xfrm_mode *outer_mode; | 208 | struct xfrm_mode *outer_mode; |
| 208 | 209 | ||
| 209 | /* Security context */ | 210 | /* Security context */ |
| @@ -387,6 +388,27 @@ enum { | |||
| 387 | extern int xfrm_register_mode(struct xfrm_mode *mode, int family); | 388 | extern int xfrm_register_mode(struct xfrm_mode *mode, int family); |
| 388 | extern int xfrm_unregister_mode(struct xfrm_mode *mode, int family); | 389 | extern int xfrm_unregister_mode(struct xfrm_mode *mode, int family); |
| 389 | 390 | ||
| 391 | static inline int xfrm_af2proto(unsigned int family) | ||
| 392 | { | ||
| 393 | switch(family) { | ||
| 394 | case AF_INET: | ||
| 395 | return IPPROTO_IPIP; | ||
| 396 | case AF_INET6: | ||
| 397 | return IPPROTO_IPV6; | ||
| 398 | default: | ||
| 399 | return 0; | ||
| 400 | } | ||
| 401 | } | ||
| 402 | |||
| 403 | static inline struct xfrm_mode *xfrm_ip2inner_mode(struct xfrm_state *x, int ipproto) | ||
| 404 | { | ||
| 405 | if ((ipproto == IPPROTO_IPIP && x->props.family == AF_INET) || | ||
| 406 | (ipproto == IPPROTO_IPV6 && x->props.family == AF_INET6)) | ||
| 407 | return x->inner_mode; | ||
| 408 | else | ||
| 409 | return x->inner_mode_iaf; | ||
| 410 | } | ||
| 411 | |||
| 390 | struct xfrm_tmpl | 412 | struct xfrm_tmpl |
| 391 | { | 413 | { |
| 392 | /* id in template is interpreted as: | 414 | /* id in template is interpreted as: |
| @@ -530,6 +552,9 @@ struct xfrm_mode_skb_cb { | |||
| 530 | __be16 id; | 552 | __be16 id; |
| 531 | __be16 frag_off; | 553 | __be16 frag_off; |
| 532 | 554 | ||
| 555 | /* IP header length (excluding options or extension headers). */ | ||
| 556 | u8 ihl; | ||
| 557 | |||
| 533 | /* TOS for IPv4, class for IPv6. */ | 558 | /* TOS for IPv4, class for IPv6. */ |
| 534 | u8 tos; | 559 | u8 tos; |
| 535 | 560 | ||
| @@ -539,6 +564,9 @@ struct xfrm_mode_skb_cb { | |||
| 539 | /* Protocol for IPv4, NH for IPv6. */ | 564 | /* Protocol for IPv4, NH for IPv6. */ |
| 540 | u8 protocol; | 565 | u8 protocol; |
| 541 | 566 | ||
| 567 | /* Option length for IPv4, zero for IPv6. */ | ||
| 568 | u8 optlen; | ||
| 569 | |||
| 542 | /* Used by IPv6 only, zero for IPv4. */ | 570 | /* Used by IPv6 only, zero for IPv4. */ |
| 543 | u8 flow_lbl[3]; | 571 | u8 flow_lbl[3]; |
| 544 | }; | 572 | }; |
| @@ -1253,6 +1281,7 @@ extern int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, | |||
| 1253 | extern int xfrm_input_resume(struct sk_buff *skb, int nexthdr); | 1281 | extern int xfrm_input_resume(struct sk_buff *skb, int nexthdr); |
| 1254 | extern int xfrm_output_resume(struct sk_buff *skb, int err); | 1282 | extern int xfrm_output_resume(struct sk_buff *skb, int err); |
| 1255 | extern int xfrm_output(struct sk_buff *skb); | 1283 | extern int xfrm_output(struct sk_buff *skb); |
| 1284 | extern int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb); | ||
| 1256 | extern int xfrm4_extract_header(struct sk_buff *skb); | 1285 | extern int xfrm4_extract_header(struct sk_buff *skb); |
| 1257 | extern int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb); | 1286 | extern int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb); |
| 1258 | extern int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi, | 1287 | extern int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi, |
diff --git a/kernel/audit.c b/kernel/audit.c index be55cb503633..b782b046543d 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -1269,8 +1269,8 @@ static void audit_log_n_string(struct audit_buffer *ab, size_t slen, | |||
| 1269 | 1269 | ||
| 1270 | /** | 1270 | /** |
| 1271 | * audit_string_contains_control - does a string need to be logged in hex | 1271 | * audit_string_contains_control - does a string need to be logged in hex |
| 1272 | * @string - string to be checked | 1272 | * @string: string to be checked |
| 1273 | * @len - max length of the string to check | 1273 | * @len: max length of the string to check |
| 1274 | */ | 1274 | */ |
| 1275 | int audit_string_contains_control(const char *string, size_t len) | 1275 | int audit_string_contains_control(const char *string, size_t len) |
| 1276 | { | 1276 | { |
| @@ -1285,7 +1285,7 @@ int audit_string_contains_control(const char *string, size_t len) | |||
| 1285 | /** | 1285 | /** |
| 1286 | * audit_log_n_untrustedstring - log a string that may contain random characters | 1286 | * audit_log_n_untrustedstring - log a string that may contain random characters |
| 1287 | * @ab: audit_buffer | 1287 | * @ab: audit_buffer |
| 1288 | * @len: lenth of string (not including trailing null) | 1288 | * @len: length of string (not including trailing null) |
| 1289 | * @string: string to be logged | 1289 | * @string: string to be logged |
| 1290 | * | 1290 | * |
| 1291 | * This code will escape a string that is passed to it if the string | 1291 | * This code will escape a string that is passed to it if the string |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e9c2fb01e89b..53d86b4b0ce0 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -2082,7 +2082,7 @@ static int cgroup_tasks_open(struct inode *unused, struct file *file) | |||
| 2082 | 2082 | ||
| 2083 | kfree(pidarray); | 2083 | kfree(pidarray); |
| 2084 | } else { | 2084 | } else { |
| 2085 | ctr->buf = 0; | 2085 | ctr->buf = NULL; |
| 2086 | ctr->bufsz = 0; | 2086 | ctr->bufsz = 0; |
| 2087 | } | 2087 | } |
| 2088 | file->private_data = ctr; | 2088 | file->private_data = ctr; |
| @@ -2614,7 +2614,7 @@ static int proc_cgroupstats_show(struct seq_file *m, void *v) | |||
| 2614 | 2614 | ||
| 2615 | static int cgroupstats_open(struct inode *inode, struct file *file) | 2615 | static int cgroupstats_open(struct inode *inode, struct file *file) |
| 2616 | { | 2616 | { |
| 2617 | return single_open(file, proc_cgroupstats_show, 0); | 2617 | return single_open(file, proc_cgroupstats_show, NULL); |
| 2618 | } | 2618 | } |
| 2619 | 2619 | ||
| 2620 | static struct file_operations proc_cgroupstats_operations = { | 2620 | static struct file_operations proc_cgroupstats_operations = { |
diff --git a/kernel/fork.c b/kernel/fork.c index dd249c37b3a3..9c042f901570 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -394,7 +394,6 @@ void __mmdrop(struct mm_struct *mm) | |||
| 394 | { | 394 | { |
| 395 | BUG_ON(mm == &init_mm); | 395 | BUG_ON(mm == &init_mm); |
| 396 | mm_free_pgd(mm); | 396 | mm_free_pgd(mm); |
| 397 | mm_free_cgroup(mm); | ||
| 398 | destroy_context(mm); | 397 | destroy_context(mm); |
| 399 | free_mm(mm); | 398 | free_mm(mm); |
| 400 | } | 399 | } |
| @@ -416,6 +415,7 @@ void mmput(struct mm_struct *mm) | |||
| 416 | spin_unlock(&mmlist_lock); | 415 | spin_unlock(&mmlist_lock); |
| 417 | } | 416 | } |
| 418 | put_swap_token(mm); | 417 | put_swap_token(mm); |
| 418 | mm_free_cgroup(mm); | ||
| 419 | mmdrop(mm); | 419 | mmdrop(mm); |
| 420 | } | 420 | } |
| 421 | } | 421 | } |
diff --git a/kernel/futex.c b/kernel/futex.c index 06968cd79200..e43945e995f5 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -281,7 +281,7 @@ static int get_futex_key(u32 __user *uaddr, struct rw_semaphore *fshared, | |||
| 281 | */ | 281 | */ |
| 282 | static void get_futex_key_refs(union futex_key *key) | 282 | static void get_futex_key_refs(union futex_key *key) |
| 283 | { | 283 | { |
| 284 | if (key->both.ptr == 0) | 284 | if (key->both.ptr == NULL) |
| 285 | return; | 285 | return; |
| 286 | switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { | 286 | switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { |
| 287 | case FUT_OFF_INODE: | 287 | case FUT_OFF_INODE: |
| @@ -2158,7 +2158,7 @@ static struct file_system_type futex_fs_type = { | |||
| 2158 | .kill_sb = kill_anon_super, | 2158 | .kill_sb = kill_anon_super, |
| 2159 | }; | 2159 | }; |
| 2160 | 2160 | ||
| 2161 | static int __init init(void) | 2161 | static int __init futex_init(void) |
| 2162 | { | 2162 | { |
| 2163 | u32 curval; | 2163 | u32 curval; |
| 2164 | int i; | 2164 | int i; |
| @@ -2194,4 +2194,4 @@ static int __init init(void) | |||
| 2194 | 2194 | ||
| 2195 | return 0; | 2195 | return 0; |
| 2196 | } | 2196 | } |
| 2197 | __initcall(init); | 2197 | __initcall(futex_init); |
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index ff90f049f8f6..04ac3a9e42cf 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c | |||
| @@ -30,7 +30,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry, | |||
| 30 | return 0; | 30 | return 0; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | static void __user *futex_uaddr(struct robust_list *entry, | 33 | static void __user *futex_uaddr(struct robust_list __user *entry, |
| 34 | compat_long_t futex_offset) | 34 | compat_long_t futex_offset) |
| 35 | { | 35 | { |
| 36 | compat_uptr_t base = ptr_to_compat(entry); | 36 | compat_uptr_t base = ptr_to_compat(entry); |
diff --git a/kernel/relay.c b/kernel/relay.c index 4c035a8a248c..d6204a485818 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
| @@ -736,7 +736,7 @@ static int relay_file_open(struct inode *inode, struct file *filp) | |||
| 736 | kref_get(&buf->kref); | 736 | kref_get(&buf->kref); |
| 737 | filp->private_data = buf; | 737 | filp->private_data = buf; |
| 738 | 738 | ||
| 739 | return 0; | 739 | return nonseekable_open(inode, filp); |
| 740 | } | 740 | } |
| 741 | 741 | ||
| 742 | /** | 742 | /** |
| @@ -1056,6 +1056,10 @@ static struct pipe_buf_operations relay_pipe_buf_ops = { | |||
| 1056 | .get = generic_pipe_buf_get, | 1056 | .get = generic_pipe_buf_get, |
| 1057 | }; | 1057 | }; |
| 1058 | 1058 | ||
| 1059 | static void relay_page_release(struct splice_pipe_desc *spd, unsigned int i) | ||
| 1060 | { | ||
| 1061 | } | ||
| 1062 | |||
| 1059 | /* | 1063 | /* |
| 1060 | * subbuf_splice_actor - splice up to one subbuf's worth of data | 1064 | * subbuf_splice_actor - splice up to one subbuf's worth of data |
| 1061 | */ | 1065 | */ |
| @@ -1083,6 +1087,7 @@ static int subbuf_splice_actor(struct file *in, | |||
| 1083 | .partial = partial, | 1087 | .partial = partial, |
| 1084 | .flags = flags, | 1088 | .flags = flags, |
| 1085 | .ops = &relay_pipe_buf_ops, | 1089 | .ops = &relay_pipe_buf_ops, |
| 1090 | .spd_release = relay_page_release, | ||
| 1086 | }; | 1091 | }; |
| 1087 | 1092 | ||
| 1088 | if (rbuf->subbufs_produced == rbuf->subbufs_consumed) | 1093 | if (rbuf->subbufs_produced == rbuf->subbufs_consumed) |
diff --git a/kernel/sched.c b/kernel/sched.c index 28c73f07efb2..8dcdec6fe0fe 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -1052,6 +1052,49 @@ static void resched_cpu(int cpu) | |||
| 1052 | resched_task(cpu_curr(cpu)); | 1052 | resched_task(cpu_curr(cpu)); |
| 1053 | spin_unlock_irqrestore(&rq->lock, flags); | 1053 | spin_unlock_irqrestore(&rq->lock, flags); |
| 1054 | } | 1054 | } |
| 1055 | |||
| 1056 | #ifdef CONFIG_NO_HZ | ||
| 1057 | /* | ||
| 1058 | * When add_timer_on() enqueues a timer into the timer wheel of an | ||
| 1059 | * idle CPU then this timer might expire before the next timer event | ||
| 1060 | * which is scheduled to wake up that CPU. In case of a completely | ||
| 1061 | * idle system the next event might even be infinite time into the | ||
| 1062 | * future. wake_up_idle_cpu() ensures that the CPU is woken up and | ||
| 1063 | * leaves the inner idle loop so the newly added timer is taken into | ||
| 1064 | * account when the CPU goes back to idle and evaluates the timer | ||
| 1065 | * wheel for the next timer event. | ||
| 1066 | */ | ||
| 1067 | void wake_up_idle_cpu(int cpu) | ||
| 1068 | { | ||
| 1069 | struct rq *rq = cpu_rq(cpu); | ||
| 1070 | |||
| 1071 | if (cpu == smp_processor_id()) | ||
| 1072 | return; | ||
| 1073 | |||
| 1074 | /* | ||
| 1075 | * This is safe, as this function is called with the timer | ||
| 1076 | * wheel base lock of (cpu) held. When the CPU is on the way | ||
| 1077 | * to idle and has not yet set rq->curr to idle then it will | ||
| 1078 | * be serialized on the timer wheel base lock and take the new | ||
| 1079 | * timer into account automatically. | ||
| 1080 | */ | ||
| 1081 | if (rq->curr != rq->idle) | ||
| 1082 | return; | ||
| 1083 | |||
| 1084 | /* | ||
| 1085 | * We can set TIF_RESCHED on the idle task of the other CPU | ||
| 1086 | * lockless. The worst case is that the other CPU runs the | ||
| 1087 | * idle task through an additional NOOP schedule() | ||
| 1088 | */ | ||
| 1089 | set_tsk_thread_flag(rq->idle, TIF_NEED_RESCHED); | ||
| 1090 | |||
| 1091 | /* NEED_RESCHED must be visible before we test polling */ | ||
| 1092 | smp_mb(); | ||
| 1093 | if (!tsk_is_polling(rq->idle)) | ||
| 1094 | smp_send_reschedule(cpu); | ||
| 1095 | } | ||
| 1096 | #endif | ||
| 1097 | |||
| 1055 | #else | 1098 | #else |
| 1056 | static void __resched_task(struct task_struct *p, int tif_bit) | 1099 | static void __resched_task(struct task_struct *p, int tif_bit) |
| 1057 | { | 1100 | { |
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 278534bbca95..7f60097d443a 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
| @@ -174,7 +174,7 @@ static void clocksource_check_watchdog(struct clocksource *cs) | |||
| 174 | if (watchdog) | 174 | if (watchdog) |
| 175 | del_timer(&watchdog_timer); | 175 | del_timer(&watchdog_timer); |
| 176 | watchdog = cs; | 176 | watchdog = cs; |
| 177 | init_timer_deferrable(&watchdog_timer); | 177 | init_timer(&watchdog_timer); |
| 178 | watchdog_timer.function = clocksource_watchdog; | 178 | watchdog_timer.function = clocksource_watchdog; |
| 179 | 179 | ||
| 180 | /* Reset watchdog cycles */ | 180 | /* Reset watchdog cycles */ |
diff --git a/kernel/timer.c b/kernel/timer.c index 99b00a25f88b..b024106daa70 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -451,10 +451,18 @@ void add_timer_on(struct timer_list *timer, int cpu) | |||
| 451 | spin_lock_irqsave(&base->lock, flags); | 451 | spin_lock_irqsave(&base->lock, flags); |
| 452 | timer_set_base(timer, base); | 452 | timer_set_base(timer, base); |
| 453 | internal_add_timer(base, timer); | 453 | internal_add_timer(base, timer); |
| 454 | /* | ||
| 455 | * Check whether the other CPU is idle and needs to be | ||
| 456 | * triggered to reevaluate the timer wheel when nohz is | ||
| 457 | * active. We are protected against the other CPU fiddling | ||
| 458 | * with the timer by holding the timer base lock. This also | ||
| 459 | * makes sure that a CPU on the way to idle can not evaluate | ||
| 460 | * the timer wheel. | ||
| 461 | */ | ||
| 462 | wake_up_idle_cpu(cpu); | ||
| 454 | spin_unlock_irqrestore(&base->lock, flags); | 463 | spin_unlock_irqrestore(&base->lock, flags); |
| 455 | } | 464 | } |
| 456 | 465 | ||
| 457 | |||
| 458 | /** | 466 | /** |
| 459 | * mod_timer - modify a timer's timeout | 467 | * mod_timer - modify a timer's timeout |
| 460 | * @timer: the timer to be modified | 468 | * @timer: the timer to be modified |
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 5a402e2982af..5b6d7f6956b9 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c | |||
| @@ -55,7 +55,7 @@ int kobject_action_type(const char *buf, size_t count, | |||
| 55 | enum kobject_action action; | 55 | enum kobject_action action; |
| 56 | int ret = -EINVAL; | 56 | int ret = -EINVAL; |
| 57 | 57 | ||
| 58 | if (count && buf[count-1] == '\n') | 58 | if (count && (buf[count-1] == '\n' || buf[count-1] == '\0')) |
| 59 | count--; | 59 | count--; |
| 60 | 60 | ||
| 61 | if (!count) | 61 | if (!count) |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 74c1b6b0b37b..51c9e2c01640 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -401,12 +401,20 @@ static void return_unused_surplus_pages(unsigned long unused_resv_pages) | |||
| 401 | struct page *page; | 401 | struct page *page; |
| 402 | unsigned long nr_pages; | 402 | unsigned long nr_pages; |
| 403 | 403 | ||
| 404 | /* | ||
| 405 | * We want to release as many surplus pages as possible, spread | ||
| 406 | * evenly across all nodes. Iterate across all nodes until we | ||
| 407 | * can no longer free unreserved surplus pages. This occurs when | ||
| 408 | * the nodes with surplus pages have no free pages. | ||
| 409 | */ | ||
| 410 | unsigned long remaining_iterations = num_online_nodes(); | ||
| 411 | |||
| 404 | /* Uncommit the reservation */ | 412 | /* Uncommit the reservation */ |
| 405 | resv_huge_pages -= unused_resv_pages; | 413 | resv_huge_pages -= unused_resv_pages; |
| 406 | 414 | ||
| 407 | nr_pages = min(unused_resv_pages, surplus_huge_pages); | 415 | nr_pages = min(unused_resv_pages, surplus_huge_pages); |
| 408 | 416 | ||
| 409 | while (nr_pages) { | 417 | while (remaining_iterations-- && nr_pages) { |
| 410 | nid = next_node(nid, node_online_map); | 418 | nid = next_node(nid, node_online_map); |
| 411 | if (nid == MAX_NUMNODES) | 419 | if (nid == MAX_NUMNODES) |
| 412 | nid = first_node(node_online_map); | 420 | nid = first_node(node_online_map); |
| @@ -424,6 +432,7 @@ static void return_unused_surplus_pages(unsigned long unused_resv_pages) | |||
| 424 | surplus_huge_pages--; | 432 | surplus_huge_pages--; |
| 425 | surplus_huge_pages_node[nid]--; | 433 | surplus_huge_pages_node[nid]--; |
| 426 | nr_pages--; | 434 | nr_pages--; |
| 435 | remaining_iterations = num_online_nodes(); | ||
| 427 | } | 436 | } |
| 428 | } | 437 | } |
| 429 | } | 438 | } |
| @@ -671,9 +680,11 @@ int hugetlb_report_node_meminfo(int nid, char *buf) | |||
| 671 | { | 680 | { |
| 672 | return sprintf(buf, | 681 | return sprintf(buf, |
| 673 | "Node %d HugePages_Total: %5u\n" | 682 | "Node %d HugePages_Total: %5u\n" |
| 674 | "Node %d HugePages_Free: %5u\n", | 683 | "Node %d HugePages_Free: %5u\n" |
| 684 | "Node %d HugePages_Surp: %5u\n", | ||
| 675 | nid, nr_huge_pages_node[nid], | 685 | nid, nr_huge_pages_node[nid], |
| 676 | nid, free_huge_pages_node[nid]); | 686 | nid, free_huge_pages_node[nid], |
| 687 | nid, surplus_huge_pages_node[nid]); | ||
| 677 | } | 688 | } |
| 678 | 689 | ||
| 679 | /* Return the number pages of memory we physically have, in PAGE_SIZE units. */ | 690 | /* Return the number pages of memory we physically have, in PAGE_SIZE units. */ |
| @@ -1481,7 +1481,7 @@ void __init kmem_cache_init(void) | |||
| 1481 | list_add(&cache_cache.next, &cache_chain); | 1481 | list_add(&cache_cache.next, &cache_chain); |
| 1482 | cache_cache.colour_off = cache_line_size(); | 1482 | cache_cache.colour_off = cache_line_size(); |
| 1483 | cache_cache.array[smp_processor_id()] = &initarray_cache.cache; | 1483 | cache_cache.array[smp_processor_id()] = &initarray_cache.cache; |
| 1484 | cache_cache.nodelists[node] = &initkmem_list3[CACHE_CACHE]; | 1484 | cache_cache.nodelists[node] = &initkmem_list3[CACHE_CACHE + node]; |
| 1485 | 1485 | ||
| 1486 | /* | 1486 | /* |
| 1487 | * struct kmem_cache size depends on nr_node_ids, which | 1487 | * struct kmem_cache size depends on nr_node_ids, which |
| @@ -1602,7 +1602,7 @@ void __init kmem_cache_init(void) | |||
| 1602 | int nid; | 1602 | int nid; |
| 1603 | 1603 | ||
| 1604 | for_each_online_node(nid) { | 1604 | for_each_online_node(nid) { |
| 1605 | init_list(&cache_cache, &initkmem_list3[CACHE_CACHE], nid); | 1605 | init_list(&cache_cache, &initkmem_list3[CACHE_CACHE + nid], nid); |
| 1606 | 1606 | ||
| 1607 | init_list(malloc_sizes[INDEX_AC].cs_cachep, | 1607 | init_list(malloc_sizes[INDEX_AC].cs_cachep, |
| 1608 | &initkmem_list3[SIZE_AC + nid], nid); | 1608 | &initkmem_list3[SIZE_AC + nid], nid); |
| @@ -1470,6 +1470,9 @@ static void *__slab_alloc(struct kmem_cache *s, | |||
| 1470 | void **object; | 1470 | void **object; |
| 1471 | struct page *new; | 1471 | struct page *new; |
| 1472 | 1472 | ||
| 1473 | /* We handle __GFP_ZERO in the caller */ | ||
| 1474 | gfpflags &= ~__GFP_ZERO; | ||
| 1475 | |||
| 1473 | if (!c->page) | 1476 | if (!c->page) |
| 1474 | goto new_slab; | 1477 | goto new_slab; |
| 1475 | 1478 | ||
| @@ -2685,6 +2688,7 @@ void kfree(const void *x) | |||
| 2685 | } | 2688 | } |
| 2686 | EXPORT_SYMBOL(kfree); | 2689 | EXPORT_SYMBOL(kfree); |
| 2687 | 2690 | ||
| 2691 | #if defined(SLUB_DEBUG) || defined(CONFIG_SLABINFO) | ||
| 2688 | static unsigned long count_partial(struct kmem_cache_node *n) | 2692 | static unsigned long count_partial(struct kmem_cache_node *n) |
| 2689 | { | 2693 | { |
| 2690 | unsigned long flags; | 2694 | unsigned long flags; |
| @@ -2697,6 +2701,7 @@ static unsigned long count_partial(struct kmem_cache_node *n) | |||
| 2697 | spin_unlock_irqrestore(&n->list_lock, flags); | 2701 | spin_unlock_irqrestore(&n->list_lock, flags); |
| 2698 | return x; | 2702 | return x; |
| 2699 | } | 2703 | } |
| 2704 | #endif | ||
| 2700 | 2705 | ||
| 2701 | /* | 2706 | /* |
| 2702 | * kmem_cache_shrink removes empty slabs from the partial lists and sorts | 2707 | * kmem_cache_shrink removes empty slabs from the partial lists and sorts |
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index cd75b21dd4c3..99c4f36eb8a3 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c | |||
| @@ -76,7 +76,7 @@ pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node) | |||
| 76 | pte_t entry; | 76 | pte_t entry; |
| 77 | void *p = vmemmap_alloc_block(PAGE_SIZE, node); | 77 | void *p = vmemmap_alloc_block(PAGE_SIZE, node); |
| 78 | if (!p) | 78 | if (!p) |
| 79 | return 0; | 79 | return NULL; |
| 80 | entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL); | 80 | entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL); |
| 81 | set_pte_at(&init_mm, addr, pte, entry); | 81 | set_pte_at(&init_mm, addr, pte, entry); |
| 82 | } | 82 | } |
| @@ -89,7 +89,7 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node) | |||
| 89 | if (pmd_none(*pmd)) { | 89 | if (pmd_none(*pmd)) { |
| 90 | void *p = vmemmap_alloc_block(PAGE_SIZE, node); | 90 | void *p = vmemmap_alloc_block(PAGE_SIZE, node); |
| 91 | if (!p) | 91 | if (!p) |
| 92 | return 0; | 92 | return NULL; |
| 93 | pmd_populate_kernel(&init_mm, pmd, p); | 93 | pmd_populate_kernel(&init_mm, pmd, p); |
| 94 | } | 94 | } |
| 95 | return pmd; | 95 | return pmd; |
| @@ -101,7 +101,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node) | |||
| 101 | if (pud_none(*pud)) { | 101 | if (pud_none(*pud)) { |
| 102 | void *p = vmemmap_alloc_block(PAGE_SIZE, node); | 102 | void *p = vmemmap_alloc_block(PAGE_SIZE, node); |
| 103 | if (!p) | 103 | if (!p) |
| 104 | return 0; | 104 | return NULL; |
| 105 | pud_populate(&init_mm, pud, p); | 105 | pud_populate(&init_mm, pud, p); |
| 106 | } | 106 | } |
| 107 | return pud; | 107 | return pud; |
| @@ -113,7 +113,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) | |||
| 113 | if (pgd_none(*pgd)) { | 113 | if (pgd_none(*pgd)) { |
| 114 | void *p = vmemmap_alloc_block(PAGE_SIZE, node); | 114 | void *p = vmemmap_alloc_block(PAGE_SIZE, node); |
| 115 | if (!p) | 115 | if (!p) |
| 116 | return 0; | 116 | return NULL; |
| 117 | pgd_populate(&init_mm, pgd, p); | 117 | pgd_populate(&init_mm, pgd, p); |
| 118 | } | 118 | } |
| 119 | return pgd; | 119 | return pgd; |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 8fbcefe10c9f..480ea90e7dcd 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
| @@ -660,7 +660,7 @@ static int vlan_dev_init(struct net_device *dev) | |||
| 660 | int subclass = 0; | 660 | int subclass = 0; |
| 661 | 661 | ||
| 662 | /* IFF_BROADCAST|IFF_MULTICAST; ??? */ | 662 | /* IFF_BROADCAST|IFF_MULTICAST; ??? */ |
| 663 | dev->flags = real_dev->flags & ~IFF_UP; | 663 | dev->flags = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI); |
| 664 | dev->iflink = real_dev->ifindex; | 664 | dev->iflink = real_dev->ifindex; |
| 665 | dev->state = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) | | 665 | dev->state = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) | |
| 666 | (1<<__LINK_STATE_DORMANT))) | | 666 | (1<<__LINK_STATE_DORMANT))) | |
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 4e8d4e724b96..f624dff76852 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c | |||
| @@ -1520,7 +1520,7 @@ static int __init p9_trans_fd_init(void) | |||
| 1520 | v9fs_register_trans(&p9_unix_trans); | 1520 | v9fs_register_trans(&p9_unix_trans); |
| 1521 | v9fs_register_trans(&p9_fd_trans); | 1521 | v9fs_register_trans(&p9_fd_trans); |
| 1522 | 1522 | ||
| 1523 | return 1; | 1523 | return 0; |
| 1524 | } | 1524 | } |
| 1525 | 1525 | ||
| 1526 | module_init(p9_trans_fd_init); | 1526 | module_init(p9_trans_fd_init); |
diff --git a/net/ax25/TODO b/net/ax25/TODO index 4089c49e45cc..69fb4e368d92 100644 --- a/net/ax25/TODO +++ b/net/ax25/TODO | |||
| @@ -9,10 +9,6 @@ being used. | |||
| 9 | Routes to a device being taken down might be deleted by ax25_rt_device_down | 9 | Routes to a device being taken down might be deleted by ax25_rt_device_down |
| 10 | but added by somebody else before the device has been deleted fully. | 10 | but added by somebody else before the device has been deleted fully. |
| 11 | 11 | ||
| 12 | Massive amounts of lock_kernel / unlock_kernel are just a temporary solution to | ||
| 13 | get around the removal of SOCKOPS_WRAP. A serious locking strategy has to be | ||
| 14 | implemented. | ||
| 15 | |||
| 16 | The ax25_rt_find_route synopsys is pervert but I somehow had to deal with | 12 | The ax25_rt_find_route synopsys is pervert but I somehow had to deal with |
| 17 | the race caused by the static variable in it's previous implementation. | 13 | the race caused by the static variable in it's previous implementation. |
| 18 | 14 | ||
diff --git a/net/core/dev.c b/net/core/dev.c index fcdf03cf3b3f..460e7f99ce3e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -3329,7 +3329,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) | |||
| 3329 | return -EOPNOTSUPP; | 3329 | return -EOPNOTSUPP; |
| 3330 | 3330 | ||
| 3331 | case SIOCADDMULTI: | 3331 | case SIOCADDMULTI: |
| 3332 | if (!dev->set_multicast_list || | 3332 | if ((!dev->set_multicast_list && !dev->set_rx_mode) || |
| 3333 | ifr->ifr_hwaddr.sa_family != AF_UNSPEC) | 3333 | ifr->ifr_hwaddr.sa_family != AF_UNSPEC) |
| 3334 | return -EINVAL; | 3334 | return -EINVAL; |
| 3335 | if (!netif_device_present(dev)) | 3335 | if (!netif_device_present(dev)) |
| @@ -3338,7 +3338,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) | |||
| 3338 | dev->addr_len, 1); | 3338 | dev->addr_len, 1); |
| 3339 | 3339 | ||
| 3340 | case SIOCDELMULTI: | 3340 | case SIOCDELMULTI: |
| 3341 | if (!dev->set_multicast_list || | 3341 | if ((!dev->set_multicast_list && !dev->set_rx_mode) || |
| 3342 | ifr->ifr_hwaddr.sa_family != AF_UNSPEC) | 3342 | ifr->ifr_hwaddr.sa_family != AF_UNSPEC) |
| 3343 | return -EINVAL; | 3343 | return -EINVAL; |
| 3344 | if (!netif_device_present(dev)) | 3344 | if (!netif_device_present(dev)) |
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index d9a02b2cc289..19b8e003f150 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
| @@ -466,6 +466,28 @@ out_neigh_release: | |||
| 466 | goto out; | 466 | goto out; |
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | struct pneigh_entry *__pneigh_lookup(struct neigh_table *tbl, | ||
| 470 | struct net *net, const void *pkey, struct net_device *dev) | ||
| 471 | { | ||
| 472 | struct pneigh_entry *n; | ||
| 473 | int key_len = tbl->key_len; | ||
| 474 | u32 hash_val = *(u32 *)(pkey + key_len - 4); | ||
| 475 | |||
| 476 | hash_val ^= (hash_val >> 16); | ||
| 477 | hash_val ^= hash_val >> 8; | ||
| 478 | hash_val ^= hash_val >> 4; | ||
| 479 | hash_val &= PNEIGH_HASHMASK; | ||
| 480 | |||
| 481 | for (n = tbl->phash_buckets[hash_val]; n; n = n->next) { | ||
| 482 | if (!memcmp(n->key, pkey, key_len) && | ||
| 483 | (n->net == net) && | ||
| 484 | (n->dev == dev || !n->dev)) | ||
| 485 | break; | ||
| 486 | } | ||
| 487 | |||
| 488 | return n; | ||
| 489 | } | ||
| 490 | |||
| 469 | struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl, | 491 | struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl, |
| 470 | struct net *net, const void *pkey, | 492 | struct net *net, const void *pkey, |
| 471 | struct net_device *dev, int creat) | 493 | struct net_device *dev, int creat) |
| @@ -2803,6 +2825,7 @@ EXPORT_SYMBOL(neigh_table_init_no_netlink); | |||
| 2803 | EXPORT_SYMBOL(neigh_update); | 2825 | EXPORT_SYMBOL(neigh_update); |
| 2804 | EXPORT_SYMBOL(pneigh_enqueue); | 2826 | EXPORT_SYMBOL(pneigh_enqueue); |
| 2805 | EXPORT_SYMBOL(pneigh_lookup); | 2827 | EXPORT_SYMBOL(pneigh_lookup); |
| 2828 | EXPORT_SYMBOL_GPL(__pneigh_lookup); | ||
| 2806 | 2829 | ||
| 2807 | #ifdef CONFIG_ARPD | 2830 | #ifdef CONFIG_ARPD |
| 2808 | EXPORT_SYMBOL(neigh_app_ns); | 2831 | EXPORT_SYMBOL(neigh_app_ns); |
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index a13c074dac09..a944e8053e28 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
| @@ -591,7 +591,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
| 591 | } | 591 | } |
| 592 | 592 | ||
| 593 | if (xfrm_decode_session_reverse(skb_in, &fl, AF_INET)) | 593 | if (xfrm_decode_session_reverse(skb_in, &fl, AF_INET)) |
| 594 | goto out_unlock; | 594 | goto ende; |
| 595 | 595 | ||
| 596 | if (inet_addr_type(net, fl.fl4_src) == RTN_LOCAL) | 596 | if (inet_addr_type(net, fl.fl4_src) == RTN_LOCAL) |
| 597 | err = __ip_route_output_key(net, &rt2, &fl); | 597 | err = __ip_route_output_key(net, &rt2, &fl); |
| @@ -601,7 +601,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
| 601 | 601 | ||
| 602 | fl2.fl4_dst = fl.fl4_src; | 602 | fl2.fl4_dst = fl.fl4_src; |
| 603 | if (ip_route_output_key(net, &rt2, &fl2)) | 603 | if (ip_route_output_key(net, &rt2, &fl2)) |
| 604 | goto out_unlock; | 604 | goto ende; |
| 605 | 605 | ||
| 606 | /* Ugh! */ | 606 | /* Ugh! */ |
| 607 | odst = skb_in->dst; | 607 | odst = skb_in->dst; |
| @@ -614,7 +614,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
| 614 | } | 614 | } |
| 615 | 615 | ||
| 616 | if (err) | 616 | if (err) |
| 617 | goto out_unlock; | 617 | goto ende; |
| 618 | 618 | ||
| 619 | err = xfrm_lookup((struct dst_entry **)&rt2, &fl, NULL, | 619 | err = xfrm_lookup((struct dst_entry **)&rt2, &fl, NULL, |
| 620 | XFRM_LOOKUP_ICMP); | 620 | XFRM_LOOKUP_ICMP); |
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c index b47030ba162b..9c798abce736 100644 --- a/net/ipv4/xfrm4_mode_beet.c +++ b/net/ipv4/xfrm4_mode_beet.c | |||
| @@ -39,13 +39,11 @@ static void xfrm4_beet_make_header(struct sk_buff *skb) | |||
| 39 | static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb) | 39 | static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb) |
| 40 | { | 40 | { |
| 41 | struct ip_beet_phdr *ph; | 41 | struct ip_beet_phdr *ph; |
| 42 | struct iphdr *iph, *top_iph; | 42 | struct iphdr *top_iph; |
| 43 | int hdrlen, optlen; | 43 | int hdrlen, optlen; |
| 44 | 44 | ||
| 45 | iph = ip_hdr(skb); | ||
| 46 | |||
| 47 | hdrlen = 0; | 45 | hdrlen = 0; |
| 48 | optlen = iph->ihl * 4 - sizeof(*iph); | 46 | optlen = XFRM_MODE_SKB_CB(skb)->optlen; |
| 49 | if (unlikely(optlen)) | 47 | if (unlikely(optlen)) |
| 50 | hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4); | 48 | hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4); |
| 51 | 49 | ||
| @@ -53,11 +51,12 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 53 | hdrlen); | 51 | hdrlen); |
| 54 | skb->mac_header = skb->network_header + | 52 | skb->mac_header = skb->network_header + |
| 55 | offsetof(struct iphdr, protocol); | 53 | offsetof(struct iphdr, protocol); |
| 56 | skb->transport_header = skb->network_header + sizeof(*iph); | 54 | skb->transport_header = skb->network_header + sizeof(*top_iph); |
| 57 | 55 | ||
| 58 | xfrm4_beet_make_header(skb); | 56 | xfrm4_beet_make_header(skb); |
| 59 | 57 | ||
| 60 | ph = (struct ip_beet_phdr *)__skb_pull(skb, sizeof(*iph) - hdrlen); | 58 | ph = (struct ip_beet_phdr *) |
| 59 | __skb_pull(skb, XFRM_MODE_SKB_CB(skb)->ihl - hdrlen); | ||
| 61 | 60 | ||
| 62 | top_iph = ip_hdr(skb); | 61 | top_iph = ip_hdr(skb); |
| 63 | 62 | ||
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index 8dee617ee900..584e6d74e3a9 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c | |||
| @@ -41,7 +41,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 41 | top_iph->ihl = 5; | 41 | top_iph->ihl = 5; |
| 42 | top_iph->version = 4; | 42 | top_iph->version = 4; |
| 43 | 43 | ||
| 44 | top_iph->protocol = x->inner_mode->afinfo->proto; | 44 | top_iph->protocol = xfrm_af2proto(skb->dst->ops->family); |
| 45 | 45 | ||
| 46 | /* DS disclosed */ | 46 | /* DS disclosed */ |
| 47 | top_iph->tos = INET_ECN_encapsulate(XFRM_MODE_SKB_CB(skb)->tos, | 47 | top_iph->tos = INET_ECN_encapsulate(XFRM_MODE_SKB_CB(skb)->tos, |
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c index d5a58a818021..8c3180adddbf 100644 --- a/net/ipv4/xfrm4_output.c +++ b/net/ipv4/xfrm4_output.c | |||
| @@ -56,7 +56,7 @@ int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 56 | { | 56 | { |
| 57 | int err; | 57 | int err; |
| 58 | 58 | ||
| 59 | err = x->inner_mode->afinfo->extract_output(x, skb); | 59 | err = xfrm_inner_extract_output(x, skb); |
| 60 | if (err) | 60 | if (err) |
| 61 | return err; | 61 | return err; |
| 62 | 62 | ||
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index fdeebe68a379..07735ed280d7 100644 --- a/net/ipv4/xfrm4_state.c +++ b/net/ipv4/xfrm4_state.c | |||
| @@ -52,10 +52,12 @@ int xfrm4_extract_header(struct sk_buff *skb) | |||
| 52 | { | 52 | { |
| 53 | struct iphdr *iph = ip_hdr(skb); | 53 | struct iphdr *iph = ip_hdr(skb); |
| 54 | 54 | ||
| 55 | XFRM_MODE_SKB_CB(skb)->ihl = sizeof(*iph); | ||
| 55 | XFRM_MODE_SKB_CB(skb)->id = iph->id; | 56 | XFRM_MODE_SKB_CB(skb)->id = iph->id; |
| 56 | XFRM_MODE_SKB_CB(skb)->frag_off = iph->frag_off; | 57 | XFRM_MODE_SKB_CB(skb)->frag_off = iph->frag_off; |
| 57 | XFRM_MODE_SKB_CB(skb)->tos = iph->tos; | 58 | XFRM_MODE_SKB_CB(skb)->tos = iph->tos; |
| 58 | XFRM_MODE_SKB_CB(skb)->ttl = iph->ttl; | 59 | XFRM_MODE_SKB_CB(skb)->ttl = iph->ttl; |
| 60 | XFRM_MODE_SKB_CB(skb)->optlen = iph->ihl * 4 - sizeof(*iph); | ||
| 59 | memset(XFRM_MODE_SKB_CB(skb)->flow_lbl, 0, | 61 | memset(XFRM_MODE_SKB_CB(skb)->flow_lbl, 0, |
| 60 | sizeof(XFRM_MODE_SKB_CB(skb)->flow_lbl)); | 62 | sizeof(XFRM_MODE_SKB_CB(skb)->flow_lbl)); |
| 61 | 63 | ||
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 51557c27a0cd..452a2ac4eec8 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -676,6 +676,20 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb) | |||
| 676 | } | 676 | } |
| 677 | } | 677 | } |
| 678 | 678 | ||
| 679 | static struct pneigh_entry *pndisc_check_router(struct net_device *dev, | ||
| 680 | struct in6_addr *addr, int *is_router) | ||
| 681 | { | ||
| 682 | struct pneigh_entry *n; | ||
| 683 | |||
| 684 | read_lock_bh(&nd_tbl.lock); | ||
| 685 | n = __pneigh_lookup(&nd_tbl, &init_net, addr, dev); | ||
| 686 | if (n != NULL) | ||
| 687 | *is_router = (n->flags & NTF_ROUTER); | ||
| 688 | read_unlock_bh(&nd_tbl.lock); | ||
| 689 | |||
| 690 | return n; | ||
| 691 | } | ||
| 692 | |||
| 679 | static void ndisc_recv_ns(struct sk_buff *skb) | 693 | static void ndisc_recv_ns(struct sk_buff *skb) |
| 680 | { | 694 | { |
| 681 | struct nd_msg *msg = (struct nd_msg *)skb_transport_header(skb); | 695 | struct nd_msg *msg = (struct nd_msg *)skb_transport_header(skb); |
| @@ -692,7 +706,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) | |||
| 692 | struct pneigh_entry *pneigh = NULL; | 706 | struct pneigh_entry *pneigh = NULL; |
| 693 | int dad = ipv6_addr_any(saddr); | 707 | int dad = ipv6_addr_any(saddr); |
| 694 | int inc; | 708 | int inc; |
| 695 | int is_router; | 709 | int is_router = 0; |
| 696 | 710 | ||
| 697 | if (ipv6_addr_is_multicast(&msg->target)) { | 711 | if (ipv6_addr_is_multicast(&msg->target)) { |
| 698 | ND_PRINTK2(KERN_WARNING | 712 | ND_PRINTK2(KERN_WARNING |
| @@ -790,8 +804,8 @@ static void ndisc_recv_ns(struct sk_buff *skb) | |||
| 790 | if (ipv6_chk_acast_addr(dev, &msg->target) || | 804 | if (ipv6_chk_acast_addr(dev, &msg->target) || |
| 791 | (idev->cnf.forwarding && | 805 | (idev->cnf.forwarding && |
| 792 | (ipv6_devconf.proxy_ndp || idev->cnf.proxy_ndp) && | 806 | (ipv6_devconf.proxy_ndp || idev->cnf.proxy_ndp) && |
| 793 | (pneigh = pneigh_lookup(&nd_tbl, &init_net, | 807 | (pneigh = pndisc_check_router(dev, &msg->target, |
| 794 | &msg->target, dev, 0)) != NULL)) { | 808 | &is_router)) != NULL)) { |
| 795 | if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) && | 809 | if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) && |
| 796 | skb->pkt_type != PACKET_HOST && | 810 | skb->pkt_type != PACKET_HOST && |
| 797 | inc != 0 && | 811 | inc != 0 && |
| @@ -812,7 +826,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) | |||
| 812 | goto out; | 826 | goto out; |
| 813 | } | 827 | } |
| 814 | 828 | ||
| 815 | is_router = !!(pneigh ? pneigh->flags & NTF_ROUTER : idev->cnf.forwarding); | 829 | is_router = !!(pneigh ? is_router : idev->cnf.forwarding); |
| 816 | 830 | ||
| 817 | if (dad) { | 831 | if (dad) { |
| 818 | struct in6_addr maddr; | 832 | struct in6_addr maddr; |
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c index 0527d11c1ae3..d6ce400f585f 100644 --- a/net/ipv6/xfrm6_mode_beet.c +++ b/net/ipv6/xfrm6_mode_beet.c | |||
| @@ -45,6 +45,7 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 45 | skb->mac_header = skb->network_header + | 45 | skb->mac_header = skb->network_header + |
| 46 | offsetof(struct ipv6hdr, nexthdr); | 46 | offsetof(struct ipv6hdr, nexthdr); |
| 47 | skb->transport_header = skb->network_header + sizeof(*top_iph); | 47 | skb->transport_header = skb->network_header + sizeof(*top_iph); |
| 48 | __skb_pull(skb, XFRM_MODE_SKB_CB(skb)->ihl); | ||
| 48 | 49 | ||
| 49 | xfrm6_beet_make_header(skb); | 50 | xfrm6_beet_make_header(skb); |
| 50 | 51 | ||
diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c index 0c742faaa30b..e20529b4c825 100644 --- a/net/ipv6/xfrm6_mode_tunnel.c +++ b/net/ipv6/xfrm6_mode_tunnel.c | |||
| @@ -45,7 +45,7 @@ static int xfrm6_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 45 | 45 | ||
| 46 | memcpy(top_iph->flow_lbl, XFRM_MODE_SKB_CB(skb)->flow_lbl, | 46 | memcpy(top_iph->flow_lbl, XFRM_MODE_SKB_CB(skb)->flow_lbl, |
| 47 | sizeof(top_iph->flow_lbl)); | 47 | sizeof(top_iph->flow_lbl)); |
| 48 | top_iph->nexthdr = x->inner_mode->afinfo->proto; | 48 | top_iph->nexthdr = xfrm_af2proto(skb->dst->ops->family); |
| 49 | 49 | ||
| 50 | dsfield = XFRM_MODE_SKB_CB(skb)->tos; | 50 | dsfield = XFRM_MODE_SKB_CB(skb)->tos; |
| 51 | dsfield = INET_ECN_encapsulate(dsfield, dsfield); | 51 | dsfield = INET_ECN_encapsulate(dsfield, dsfield); |
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index 79ccfb080733..0af823cf7f1f 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c | |||
| @@ -62,7 +62,7 @@ int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 62 | { | 62 | { |
| 63 | int err; | 63 | int err; |
| 64 | 64 | ||
| 65 | err = x->inner_mode->afinfo->extract_output(x, skb); | 65 | err = xfrm_inner_extract_output(x, skb); |
| 66 | if (err) | 66 | if (err) |
| 67 | return err; | 67 | return err; |
| 68 | 68 | ||
diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c index dc817e035e23..ff1e1db8e236 100644 --- a/net/ipv6/xfrm6_state.c +++ b/net/ipv6/xfrm6_state.c | |||
| @@ -174,10 +174,12 @@ int xfrm6_extract_header(struct sk_buff *skb) | |||
| 174 | { | 174 | { |
| 175 | struct ipv6hdr *iph = ipv6_hdr(skb); | 175 | struct ipv6hdr *iph = ipv6_hdr(skb); |
| 176 | 176 | ||
| 177 | XFRM_MODE_SKB_CB(skb)->ihl = sizeof(*iph); | ||
| 177 | XFRM_MODE_SKB_CB(skb)->id = 0; | 178 | XFRM_MODE_SKB_CB(skb)->id = 0; |
| 178 | XFRM_MODE_SKB_CB(skb)->frag_off = htons(IP_DF); | 179 | XFRM_MODE_SKB_CB(skb)->frag_off = htons(IP_DF); |
| 179 | XFRM_MODE_SKB_CB(skb)->tos = ipv6_get_dsfield(iph); | 180 | XFRM_MODE_SKB_CB(skb)->tos = ipv6_get_dsfield(iph); |
| 180 | XFRM_MODE_SKB_CB(skb)->ttl = iph->hop_limit; | 181 | XFRM_MODE_SKB_CB(skb)->ttl = iph->hop_limit; |
| 182 | XFRM_MODE_SKB_CB(skb)->optlen = 0; | ||
| 181 | memcpy(XFRM_MODE_SKB_CB(skb)->flow_lbl, iph->flow_lbl, | 183 | memcpy(XFRM_MODE_SKB_CB(skb)->flow_lbl, iph->flow_lbl, |
| 182 | sizeof(XFRM_MODE_SKB_CB(skb)->flow_lbl)); | 184 | sizeof(XFRM_MODE_SKB_CB(skb)->flow_lbl)); |
| 183 | 185 | ||
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index bc2e15ce7004..7873c392ab4c 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h | |||
| @@ -405,7 +405,7 @@ typedef struct irnet_socket | |||
| 405 | /* "pppd" interact directly with us on a /dev/ file */ | 405 | /* "pppd" interact directly with us on a /dev/ file */ |
| 406 | struct file * file; /* File descriptor of this instance */ | 406 | struct file * file; /* File descriptor of this instance */ |
| 407 | /* TTY stuff - to keep "pppd" happy */ | 407 | /* TTY stuff - to keep "pppd" happy */ |
| 408 | struct termios termios; /* Various tty flags */ | 408 | struct ktermios termios; /* Various tty flags */ |
| 409 | /* Stuff for the control channel */ | 409 | /* Stuff for the control channel */ |
| 410 | int event_index; /* Last read in the event log */ | 410 | int event_index; /* Last read in the event log */ |
| 411 | 411 | ||
diff --git a/net/key/af_key.c b/net/key/af_key.c index 8b5f486ac80f..e9ef9af4a53b 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
| @@ -1219,7 +1219,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr, | |||
| 1219 | x->sel.prefixlen_s = addr->sadb_address_prefixlen; | 1219 | x->sel.prefixlen_s = addr->sadb_address_prefixlen; |
| 1220 | } | 1220 | } |
| 1221 | 1221 | ||
| 1222 | if (!x->sel.family) | 1222 | if (x->props.mode == XFRM_MODE_TRANSPORT) |
| 1223 | x->sel.family = x->props.family; | 1223 | x->sel.family = x->props.family; |
| 1224 | 1224 | ||
| 1225 | if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) { | 1225 | if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) { |
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 1aaa2e804b0d..126ca777b410 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | struct rxrpc_crypt { | 23 | struct rxrpc_crypt { |
| 24 | union { | 24 | union { |
| 25 | u8 x[FCRYPT_BSIZE]; | 25 | u8 x[FCRYPT_BSIZE]; |
| 26 | u32 n[2]; | 26 | __be32 n[2]; |
| 27 | }; | 27 | }; |
| 28 | } __attribute__((aligned(8))); | 28 | } __attribute__((aligned(8))); |
| 29 | 29 | ||
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index f48434adb7c2..d1c296f2d617 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c | |||
| @@ -261,6 +261,7 @@ static int rxkad_secure_packet(const struct rxrpc_call *call, | |||
| 261 | __be32 x[2]; | 261 | __be32 x[2]; |
| 262 | } tmpbuf __attribute__((aligned(8))); /* must all be in same page */ | 262 | } tmpbuf __attribute__((aligned(8))); /* must all be in same page */ |
| 263 | __be32 x; | 263 | __be32 x; |
| 264 | u32 y; | ||
| 264 | int ret; | 265 | int ret; |
| 265 | 266 | ||
| 266 | sp = rxrpc_skb(skb); | 267 | sp = rxrpc_skb(skb); |
| @@ -292,11 +293,11 @@ static int rxkad_secure_packet(const struct rxrpc_call *call, | |||
| 292 | sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf)); | 293 | sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf)); |
| 293 | crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); | 294 | crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); |
| 294 | 295 | ||
| 295 | x = ntohl(tmpbuf.x[1]); | 296 | y = ntohl(tmpbuf.x[1]); |
| 296 | x = (x >> 16) & 0xffff; | 297 | y = (y >> 16) & 0xffff; |
| 297 | if (x == 0) | 298 | if (y == 0) |
| 298 | x = 1; /* zero checksums are not permitted */ | 299 | y = 1; /* zero checksums are not permitted */ |
| 299 | sp->hdr.cksum = htons(x); | 300 | sp->hdr.cksum = htons(y); |
| 300 | 301 | ||
| 301 | switch (call->conn->security_level) { | 302 | switch (call->conn->security_level) { |
| 302 | case RXRPC_SECURITY_PLAIN: | 303 | case RXRPC_SECURITY_PLAIN: |
| @@ -314,7 +315,7 @@ static int rxkad_secure_packet(const struct rxrpc_call *call, | |||
| 314 | break; | 315 | break; |
| 315 | } | 316 | } |
| 316 | 317 | ||
| 317 | _leave(" = %d [set %hx]", ret, x); | 318 | _leave(" = %d [set %hx]", ret, y); |
| 318 | return ret; | 319 | return ret; |
| 319 | } | 320 | } |
| 320 | 321 | ||
| @@ -492,6 +493,7 @@ static int rxkad_verify_packet(const struct rxrpc_call *call, | |||
| 492 | __be32 x[2]; | 493 | __be32 x[2]; |
| 493 | } tmpbuf __attribute__((aligned(8))); /* must all be in same page */ | 494 | } tmpbuf __attribute__((aligned(8))); /* must all be in same page */ |
| 494 | __be32 x; | 495 | __be32 x; |
| 496 | u16 y; | ||
| 495 | __be16 cksum; | 497 | __be16 cksum; |
| 496 | int ret; | 498 | int ret; |
| 497 | 499 | ||
| @@ -526,12 +528,12 @@ static int rxkad_verify_packet(const struct rxrpc_call *call, | |||
| 526 | sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf)); | 528 | sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf)); |
| 527 | crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); | 529 | crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); |
| 528 | 530 | ||
| 529 | x = ntohl(tmpbuf.x[1]); | 531 | y = ntohl(tmpbuf.x[1]); |
| 530 | x = (x >> 16) & 0xffff; | 532 | y = (y >> 16) & 0xffff; |
| 531 | if (x == 0) | 533 | if (y == 0) |
| 532 | x = 1; /* zero checksums are not permitted */ | 534 | y = 1; /* zero checksums are not permitted */ |
| 533 | 535 | ||
| 534 | cksum = htons(x); | 536 | cksum = htons(y); |
| 535 | if (sp->hdr.cksum != cksum) { | 537 | if (sp->hdr.cksum != cksum) { |
| 536 | *_abort_code = RXKADSEALEDINCON; | 538 | *_abort_code = RXKADSEALEDINCON; |
| 537 | _leave(" = -EPROTO [csum failed]"); | 539 | _leave(" = -EPROTO [csum failed]"); |
| @@ -1001,7 +1003,8 @@ static int rxkad_verify_response(struct rxrpc_connection *conn, | |||
| 1001 | struct rxrpc_crypt session_key; | 1003 | struct rxrpc_crypt session_key; |
| 1002 | time_t expiry; | 1004 | time_t expiry; |
| 1003 | void *ticket; | 1005 | void *ticket; |
| 1004 | u32 abort_code, version, kvno, ticket_len, csum, level; | 1006 | u32 abort_code, version, kvno, ticket_len, level; |
| 1007 | __be32 csum; | ||
| 1005 | int ret; | 1008 | int ret; |
| 1006 | 1009 | ||
| 1007 | _enter("{%d,%x}", conn->debug_id, key_serial(conn->server_key)); | 1010 | _enter("{%d,%x}", conn->debug_id, key_serial(conn->server_key)); |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index 971271602dd0..c22d6b6f2db4 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |||
| @@ -322,15 +322,6 @@ next_sge: | |||
| 322 | ctxt->direction = DMA_FROM_DEVICE; | 322 | ctxt->direction = DMA_FROM_DEVICE; |
| 323 | clear_bit(RDMACTXT_F_READ_DONE, &ctxt->flags); | 323 | clear_bit(RDMACTXT_F_READ_DONE, &ctxt->flags); |
| 324 | clear_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags); | 324 | clear_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags); |
| 325 | if ((ch+1)->rc_discrim == 0) { | ||
| 326 | /* | ||
| 327 | * Checked in sq_cq_reap to see if we need to | ||
| 328 | * be enqueued | ||
| 329 | */ | ||
| 330 | set_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags); | ||
| 331 | ctxt->next = hdr_ctxt; | ||
| 332 | hdr_ctxt->next = head; | ||
| 333 | } | ||
| 334 | 325 | ||
| 335 | /* Prepare READ WR */ | 326 | /* Prepare READ WR */ |
| 336 | memset(&read_wr, 0, sizeof read_wr); | 327 | memset(&read_wr, 0, sizeof read_wr); |
| @@ -348,7 +339,17 @@ next_sge: | |||
| 348 | rdma_set_ctxt_sge(ctxt, &sge[ch_sge_ary[ch_no].start], | 339 | rdma_set_ctxt_sge(ctxt, &sge[ch_sge_ary[ch_no].start], |
| 349 | &sgl_offset, | 340 | &sgl_offset, |
| 350 | read_wr.num_sge); | 341 | read_wr.num_sge); |
| 351 | 342 | if (((ch+1)->rc_discrim == 0) && | |
| 343 | (read_wr.num_sge == ch_sge_ary[ch_no].count)) { | ||
| 344 | /* | ||
| 345 | * Mark the last RDMA_READ with a bit to | ||
| 346 | * indicate all RPC data has been fetched from | ||
| 347 | * the client and the RPC needs to be enqueued. | ||
| 348 | */ | ||
| 349 | set_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags); | ||
| 350 | ctxt->next = hdr_ctxt; | ||
| 351 | hdr_ctxt->next = head; | ||
| 352 | } | ||
| 352 | /* Post the read */ | 353 | /* Post the read */ |
| 353 | err = svc_rdma_send(xprt, &read_wr); | 354 | err = svc_rdma_send(xprt, &read_wr); |
| 354 | if (err) { | 355 | if (err) { |
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 62188c6a06dd..75279402ccf4 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c | |||
| @@ -84,14 +84,21 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq) | |||
| 84 | 84 | ||
| 85 | int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb) | 85 | int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb) |
| 86 | { | 86 | { |
| 87 | struct xfrm_mode *inner_mode = x->inner_mode; | ||
| 87 | int err; | 88 | int err; |
| 88 | 89 | ||
| 89 | err = x->outer_mode->afinfo->extract_input(x, skb); | 90 | err = x->outer_mode->afinfo->extract_input(x, skb); |
| 90 | if (err) | 91 | if (err) |
| 91 | return err; | 92 | return err; |
| 92 | 93 | ||
| 93 | skb->protocol = x->inner_mode->afinfo->eth_proto; | 94 | if (x->sel.family == AF_UNSPEC) { |
| 94 | return x->inner_mode->input2(x, skb); | 95 | inner_mode = xfrm_ip2inner_mode(x, XFRM_MODE_SKB_CB(skb)->protocol); |
| 96 | if (inner_mode == NULL) | ||
| 97 | return -EAFNOSUPPORT; | ||
| 98 | } | ||
| 99 | |||
| 100 | skb->protocol = inner_mode->afinfo->eth_proto; | ||
| 101 | return inner_mode->input2(x, skb); | ||
| 95 | } | 102 | } |
| 96 | EXPORT_SYMBOL(xfrm_prepare_input); | 103 | EXPORT_SYMBOL(xfrm_prepare_input); |
| 97 | 104 | ||
| @@ -101,6 +108,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) | |||
| 101 | __be32 seq; | 108 | __be32 seq; |
| 102 | struct xfrm_state *x; | 109 | struct xfrm_state *x; |
| 103 | xfrm_address_t *daddr; | 110 | xfrm_address_t *daddr; |
| 111 | struct xfrm_mode *inner_mode; | ||
| 104 | unsigned int family; | 112 | unsigned int family; |
| 105 | int decaps = 0; | 113 | int decaps = 0; |
| 106 | int async = 0; | 114 | int async = 0; |
| @@ -207,7 +215,15 @@ resume: | |||
| 207 | 215 | ||
| 208 | XFRM_MODE_SKB_CB(skb)->protocol = nexthdr; | 216 | XFRM_MODE_SKB_CB(skb)->protocol = nexthdr; |
| 209 | 217 | ||
| 210 | if (x->inner_mode->input(x, skb)) { | 218 | inner_mode = x->inner_mode; |
| 219 | |||
| 220 | if (x->sel.family == AF_UNSPEC) { | ||
| 221 | inner_mode = xfrm_ip2inner_mode(x, XFRM_MODE_SKB_CB(skb)->protocol); | ||
| 222 | if (inner_mode == NULL) | ||
| 223 | goto drop; | ||
| 224 | } | ||
| 225 | |||
| 226 | if (inner_mode->input(x, skb)) { | ||
| 211 | XFRM_INC_STATS(LINUX_MIB_XFRMINSTATEMODEERROR); | 227 | XFRM_INC_STATS(LINUX_MIB_XFRMINSTATEMODEERROR); |
| 212 | goto drop; | 228 | goto drop; |
| 213 | } | 229 | } |
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 569d377932c4..2519129c6d21 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c | |||
| @@ -124,7 +124,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err) | |||
| 124 | if (!x) | 124 | if (!x) |
| 125 | return dst_output(skb); | 125 | return dst_output(skb); |
| 126 | 126 | ||
| 127 | err = nf_hook(x->inner_mode->afinfo->family, | 127 | err = nf_hook(skb->dst->ops->family, |
| 128 | NF_INET_POST_ROUTING, skb, | 128 | NF_INET_POST_ROUTING, skb, |
| 129 | NULL, skb->dst->dev, xfrm_output2); | 129 | NULL, skb->dst->dev, xfrm_output2); |
| 130 | if (unlikely(err != 1)) | 130 | if (unlikely(err != 1)) |
| @@ -193,4 +193,20 @@ int xfrm_output(struct sk_buff *skb) | |||
| 193 | 193 | ||
| 194 | return xfrm_output2(skb); | 194 | return xfrm_output2(skb); |
| 195 | } | 195 | } |
| 196 | |||
| 197 | int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb) | ||
| 198 | { | ||
| 199 | struct xfrm_mode *inner_mode; | ||
| 200 | if (x->sel.family == AF_UNSPEC) | ||
| 201 | inner_mode = xfrm_ip2inner_mode(x, | ||
| 202 | xfrm_af2proto(skb->dst->ops->family)); | ||
| 203 | else | ||
| 204 | inner_mode = x->inner_mode; | ||
| 205 | |||
| 206 | if (inner_mode == NULL) | ||
| 207 | return -EAFNOSUPPORT; | ||
| 208 | return inner_mode->afinfo->extract_output(x, skb); | ||
| 209 | } | ||
| 210 | |||
| 196 | EXPORT_SYMBOL_GPL(xfrm_output); | 211 | EXPORT_SYMBOL_GPL(xfrm_output); |
| 212 | EXPORT_SYMBOL_GPL(xfrm_inner_extract_output); | ||
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 7ba65e82941c..58f1f9347b54 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
| @@ -388,6 +388,8 @@ static void xfrm_state_gc_destroy(struct xfrm_state *x) | |||
| 388 | kfree(x->coaddr); | 388 | kfree(x->coaddr); |
| 389 | if (x->inner_mode) | 389 | if (x->inner_mode) |
| 390 | xfrm_put_mode(x->inner_mode); | 390 | xfrm_put_mode(x->inner_mode); |
| 391 | if (x->inner_mode_iaf) | ||
| 392 | xfrm_put_mode(x->inner_mode_iaf); | ||
| 391 | if (x->outer_mode) | 393 | if (x->outer_mode) |
| 392 | xfrm_put_mode(x->outer_mode); | 394 | xfrm_put_mode(x->outer_mode); |
| 393 | if (x->type) { | 395 | if (x->type) { |
| @@ -523,6 +525,8 @@ struct xfrm_state *xfrm_state_alloc(void) | |||
| 523 | x->lft.hard_packet_limit = XFRM_INF; | 525 | x->lft.hard_packet_limit = XFRM_INF; |
| 524 | x->replay_maxage = 0; | 526 | x->replay_maxage = 0; |
| 525 | x->replay_maxdiff = 0; | 527 | x->replay_maxdiff = 0; |
| 528 | x->inner_mode = NULL; | ||
| 529 | x->inner_mode_iaf = NULL; | ||
| 526 | spin_lock_init(&x->lock); | 530 | spin_lock_init(&x->lock); |
| 527 | } | 531 | } |
| 528 | return x; | 532 | return x; |
| @@ -796,7 +800,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
| 796 | selector. | 800 | selector. |
| 797 | */ | 801 | */ |
| 798 | if (x->km.state == XFRM_STATE_VALID) { | 802 | if (x->km.state == XFRM_STATE_VALID) { |
| 799 | if (!xfrm_selector_match(&x->sel, fl, x->sel.family) || | 803 | if ((x->sel.family && !xfrm_selector_match(&x->sel, fl, x->sel.family)) || |
| 800 | !security_xfrm_state_pol_flow_match(x, pol, fl)) | 804 | !security_xfrm_state_pol_flow_match(x, pol, fl)) |
| 801 | continue; | 805 | continue; |
| 802 | if (!best || | 806 | if (!best || |
| @@ -1944,6 +1948,7 @@ int xfrm_state_mtu(struct xfrm_state *x, int mtu) | |||
| 1944 | int xfrm_init_state(struct xfrm_state *x) | 1948 | int xfrm_init_state(struct xfrm_state *x) |
| 1945 | { | 1949 | { |
| 1946 | struct xfrm_state_afinfo *afinfo; | 1950 | struct xfrm_state_afinfo *afinfo; |
| 1951 | struct xfrm_mode *inner_mode; | ||
| 1947 | int family = x->props.family; | 1952 | int family = x->props.family; |
| 1948 | int err; | 1953 | int err; |
| 1949 | 1954 | ||
| @@ -1962,13 +1967,48 @@ int xfrm_init_state(struct xfrm_state *x) | |||
| 1962 | goto error; | 1967 | goto error; |
| 1963 | 1968 | ||
| 1964 | err = -EPROTONOSUPPORT; | 1969 | err = -EPROTONOSUPPORT; |
| 1965 | x->inner_mode = xfrm_get_mode(x->props.mode, x->sel.family); | ||
| 1966 | if (x->inner_mode == NULL) | ||
| 1967 | goto error; | ||
| 1968 | 1970 | ||
| 1969 | if (!(x->inner_mode->flags & XFRM_MODE_FLAG_TUNNEL) && | 1971 | if (x->sel.family != AF_UNSPEC) { |
| 1970 | family != x->sel.family) | 1972 | inner_mode = xfrm_get_mode(x->props.mode, x->sel.family); |
| 1971 | goto error; | 1973 | if (inner_mode == NULL) |
| 1974 | goto error; | ||
| 1975 | |||
| 1976 | if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL) && | ||
| 1977 | family != x->sel.family) { | ||
| 1978 | xfrm_put_mode(inner_mode); | ||
| 1979 | goto error; | ||
| 1980 | } | ||
| 1981 | |||
| 1982 | x->inner_mode = inner_mode; | ||
| 1983 | } else { | ||
| 1984 | struct xfrm_mode *inner_mode_iaf; | ||
| 1985 | |||
| 1986 | inner_mode = xfrm_get_mode(x->props.mode, AF_INET); | ||
| 1987 | if (inner_mode == NULL) | ||
| 1988 | goto error; | ||
| 1989 | |||
| 1990 | if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL)) { | ||
| 1991 | xfrm_put_mode(inner_mode); | ||
| 1992 | goto error; | ||
| 1993 | } | ||
| 1994 | |||
| 1995 | inner_mode_iaf = xfrm_get_mode(x->props.mode, AF_INET6); | ||
| 1996 | if (inner_mode_iaf == NULL) | ||
| 1997 | goto error; | ||
| 1998 | |||
| 1999 | if (!(inner_mode_iaf->flags & XFRM_MODE_FLAG_TUNNEL)) { | ||
| 2000 | xfrm_put_mode(inner_mode_iaf); | ||
| 2001 | goto error; | ||
| 2002 | } | ||
| 2003 | |||
| 2004 | if (x->props.family == AF_INET) { | ||
| 2005 | x->inner_mode = inner_mode; | ||
| 2006 | x->inner_mode_iaf = inner_mode_iaf; | ||
| 2007 | } else { | ||
| 2008 | x->inner_mode = inner_mode_iaf; | ||
| 2009 | x->inner_mode_iaf = inner_mode; | ||
| 2010 | } | ||
| 2011 | } | ||
| 1972 | 2012 | ||
| 1973 | x->type = xfrm_get_type(x->id.proto, family); | 2013 | x->type = xfrm_get_type(x->id.proto, family); |
| 1974 | if (x->type == NULL) | 2014 | if (x->type == NULL) |
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index f971ca5645f8..5d96f2728dc6 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
| @@ -288,12 +288,9 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info * | |||
| 288 | memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr)); | 288 | memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr)); |
| 289 | x->props.flags = p->flags; | 289 | x->props.flags = p->flags; |
| 290 | 290 | ||
| 291 | /* | 291 | if (x->props.mode == XFRM_MODE_TRANSPORT) |
| 292 | * Set inner address family if the KM left it as zero. | ||
| 293 | * See comment in validate_tmpl. | ||
| 294 | */ | ||
| 295 | if (!x->sel.family) | ||
| 296 | x->sel.family = p->family; | 292 | x->sel.family = p->family; |
| 293 | |||
| 297 | } | 294 | } |
| 298 | 295 | ||
| 299 | /* | 296 | /* |
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 2a7cef9726e4..58a94947d655 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
| @@ -9,7 +9,7 @@ use strict; | |||
| 9 | my $P = $0; | 9 | my $P = $0; |
| 10 | $P =~ s@.*/@@g; | 10 | $P =~ s@.*/@@g; |
| 11 | 11 | ||
| 12 | my $V = '0.15'; | 12 | my $V = '0.16'; |
| 13 | 13 | ||
| 14 | use Getopt::Long qw(:config no_auto_abbrev); | 14 | use Getopt::Long qw(:config no_auto_abbrev); |
| 15 | 15 | ||
| @@ -18,6 +18,7 @@ my $tree = 1; | |||
| 18 | my $chk_signoff = 1; | 18 | my $chk_signoff = 1; |
| 19 | my $chk_patch = 1; | 19 | my $chk_patch = 1; |
| 20 | my $tst_type = 0; | 20 | my $tst_type = 0; |
| 21 | my $tst_only; | ||
| 21 | my $emacs = 0; | 22 | my $emacs = 0; |
| 22 | my $terse = 0; | 23 | my $terse = 0; |
| 23 | my $file = 0; | 24 | my $file = 0; |
| @@ -44,6 +45,7 @@ GetOptions( | |||
| 44 | 45 | ||
| 45 | 'debug=s' => \%debug, | 46 | 'debug=s' => \%debug, |
| 46 | 'test-type!' => \$tst_type, | 47 | 'test-type!' => \$tst_type, |
| 48 | 'test-only=s' => \$tst_only, | ||
| 47 | ) or exit; | 49 | ) or exit; |
| 48 | 50 | ||
| 49 | my $exit = 0; | 51 | my $exit = 0; |
| @@ -263,17 +265,7 @@ sub expand_tabs { | |||
| 263 | return $res; | 265 | return $res; |
| 264 | } | 266 | } |
| 265 | sub copy_spacing { | 267 | sub copy_spacing { |
| 266 | my ($str) = @_; | 268 | (my $res = shift) =~ tr/\t/ /c; |
| 267 | |||
| 268 | my $res = ''; | ||
| 269 | for my $c (split(//, $str)) { | ||
| 270 | if ($c eq "\t") { | ||
| 271 | $res .= $c; | ||
| 272 | } else { | ||
| 273 | $res .= ' '; | ||
| 274 | } | ||
| 275 | } | ||
| 276 | |||
| 277 | return $res; | 269 | return $res; |
| 278 | } | 270 | } |
| 279 | 271 | ||
| @@ -290,53 +282,76 @@ sub line_stats { | |||
| 290 | return (length($line), length($white)); | 282 | return (length($line), length($white)); |
| 291 | } | 283 | } |
| 292 | 284 | ||
| 285 | my $sanitise_quote = ''; | ||
| 286 | |||
| 287 | sub sanitise_line_reset { | ||
| 288 | my ($in_comment) = @_; | ||
| 289 | |||
| 290 | if ($in_comment) { | ||
| 291 | $sanitise_quote = '*/'; | ||
| 292 | } else { | ||
| 293 | $sanitise_quote = ''; | ||
| 294 | } | ||
| 295 | } | ||
| 293 | sub sanitise_line { | 296 | sub sanitise_line { |
| 294 | my ($line) = @_; | 297 | my ($line) = @_; |
| 295 | 298 | ||
| 296 | my $res = ''; | 299 | my $res = ''; |
| 297 | my $l = ''; | 300 | my $l = ''; |
| 298 | 301 | ||
| 299 | my $quote = ''; | ||
| 300 | my $qlen = 0; | 302 | my $qlen = 0; |
| 303 | my $off = 0; | ||
| 304 | my $c; | ||
| 301 | 305 | ||
| 302 | foreach my $c (split(//, $line)) { | 306 | # Always copy over the diff marker. |
| 303 | # The second backslash of a pair is not a "quote". | 307 | $res = substr($line, 0, 1); |
| 304 | if ($l eq "\\" && $c eq "\\") { | 308 | |
| 305 | $c = 'X'; | 309 | for ($off = 1; $off < length($line); $off++) { |
| 306 | } | 310 | $c = substr($line, $off, 1); |
| 307 | if ($l ne "\\" && ($c eq "'" || $c eq '"')) { | 311 | |
| 308 | if ($quote eq '') { | 312 | # Comments we are wacking completly including the begin |
| 309 | $quote = $c; | 313 | # and end, all to $;. |
| 310 | $res .= $c; | 314 | if ($sanitise_quote eq '' && substr($line, $off, 2) eq '/*') { |
| 311 | $l = $c; | 315 | $sanitise_quote = '*/'; |
| 312 | $qlen = 0; | 316 | |
| 313 | next; | 317 | substr($res, $off, 2, "$;$;"); |
| 314 | } elsif ($quote eq $c) { | 318 | $off++; |
| 315 | $quote = ''; | 319 | next; |
| 316 | } | ||
| 317 | } | 320 | } |
| 318 | if ($quote eq "'" && $qlen > 1) { | 321 | if (substr($line, $off, 2) eq $sanitise_quote) { |
| 319 | $quote = ''; | 322 | $sanitise_quote = ''; |
| 323 | substr($res, $off, 2, "$;$;"); | ||
| 324 | $off++; | ||
| 325 | next; | ||
| 320 | } | 326 | } |
| 321 | if ($quote && $c ne "\t") { | 327 | |
| 322 | $res .= "X"; | 328 | # A \ in a string means ignore the next character. |
| 323 | $qlen++; | 329 | if (($sanitise_quote eq "'" || $sanitise_quote eq '"') && |
| 324 | } else { | 330 | $c eq "\\") { |
| 325 | $res .= $c; | 331 | substr($res, $off, 2, 'XX'); |
| 332 | $off++; | ||
| 333 | next; | ||
| 326 | } | 334 | } |
| 335 | # Regular quotes. | ||
| 336 | if ($c eq "'" || $c eq '"') { | ||
| 337 | if ($sanitise_quote eq '') { | ||
| 338 | $sanitise_quote = $c; | ||
| 327 | 339 | ||
| 328 | $l = $c; | 340 | substr($res, $off, 1, $c); |
| 329 | } | 341 | next; |
| 342 | } elsif ($sanitise_quote eq $c) { | ||
| 343 | $sanitise_quote = ''; | ||
| 344 | } | ||
| 345 | } | ||
| 330 | 346 | ||
| 331 | # Clear out the comments. | 347 | #print "SQ:$sanitise_quote\n"; |
| 332 | while ($res =~ m@(/\*.*?\*/)@g) { | 348 | if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") { |
| 333 | substr($res, $-[1], $+[1] - $-[1]) = $; x ($+[1] - $-[1]); | 349 | substr($res, $off, 1, $;); |
| 334 | } | 350 | } elsif ($off != 0 && $sanitise_quote && $c ne "\t") { |
| 335 | if ($res =~ m@(/\*.*)@) { | 351 | substr($res, $off, 1, 'X'); |
| 336 | substr($res, $-[1], $+[1] - $-[1]) = $; x ($+[1] - $-[1]); | 352 | } else { |
| 337 | } | 353 | substr($res, $off, 1, $c); |
| 338 | if ($res =~ m@^.(.*\*/)@) { | 354 | } |
| 339 | substr($res, $-[1], $+[1] - $-[1]) = $; x ($+[1] - $-[1]); | ||
| 340 | } | 355 | } |
| 341 | 356 | ||
| 342 | # The pathname on a #include may be surrounded by '<' and '>'. | 357 | # The pathname on a #include may be surrounded by '<' and '>'. |
| @@ -359,6 +374,7 @@ sub ctx_statement_block { | |||
| 359 | my $blk = ''; | 374 | my $blk = ''; |
| 360 | my $soff = $off; | 375 | my $soff = $off; |
| 361 | my $coff = $off - 1; | 376 | my $coff = $off - 1; |
| 377 | my $coff_set = 0; | ||
| 362 | 378 | ||
| 363 | my $loff = 0; | 379 | my $loff = 0; |
| 364 | 380 | ||
| @@ -370,7 +386,7 @@ sub ctx_statement_block { | |||
| 370 | 386 | ||
| 371 | my $remainder; | 387 | my $remainder; |
| 372 | while (1) { | 388 | while (1) { |
| 373 | #warn "CSB: blk<$blk>\n"; | 389 | #warn "CSB: blk<$blk> remain<$remain>\n"; |
| 374 | # If we are about to drop off the end, pull in more | 390 | # If we are about to drop off the end, pull in more |
| 375 | # context. | 391 | # context. |
| 376 | if ($off >= $len) { | 392 | if ($off >= $len) { |
| @@ -393,7 +409,7 @@ sub ctx_statement_block { | |||
| 393 | $c = substr($blk, $off, 1); | 409 | $c = substr($blk, $off, 1); |
| 394 | $remainder = substr($blk, $off); | 410 | $remainder = substr($blk, $off); |
| 395 | 411 | ||
| 396 | #warn "CSB: c<$c> type<$type> level<$level>\n"; | 412 | #warn "CSB: c<$c> type<$type> level<$level> remainder<$remainder> coff_set<$coff_set>\n"; |
| 397 | # Statement ends at the ';' or a close '}' at the | 413 | # Statement ends at the ';' or a close '}' at the |
| 398 | # outermost level. | 414 | # outermost level. |
| 399 | if ($level == 0 && $c eq ';') { | 415 | if ($level == 0 && $c eq ';') { |
| @@ -401,10 +417,14 @@ sub ctx_statement_block { | |||
| 401 | } | 417 | } |
| 402 | 418 | ||
| 403 | # An else is really a conditional as long as its not else if | 419 | # An else is really a conditional as long as its not else if |
| 404 | if ($level == 0 && (!defined($p) || $p =~ /(?:\s|\})/) && | 420 | if ($level == 0 && $coff_set == 0 && |
| 405 | $remainder =~ /(else)(?:\s|{)/ && | 421 | (!defined($p) || $p =~ /(?:\s|\}|\+)/) && |
| 406 | $remainder !~ /else\s+if\b/) { | 422 | $remainder =~ /^(else)(?:\s|{)/ && |
| 407 | $coff = $off + length($1); | 423 | $remainder !~ /^else\s+if\b/) { |
| 424 | $coff = $off + length($1) - 1; | ||
| 425 | $coff_set = 1; | ||
| 426 | #warn "CSB: mark coff<$coff> soff<$soff> 1<$1>\n"; | ||
| 427 | #warn "[" . substr($blk, $soff, $coff - $soff + 1) . "]\n"; | ||
| 408 | } | 428 | } |
| 409 | 429 | ||
| 410 | if (($type eq '' || $type eq '(') && $c eq '(') { | 430 | if (($type eq '' || $type eq '(') && $c eq '(') { |
| @@ -417,6 +437,8 @@ sub ctx_statement_block { | |||
| 417 | 437 | ||
| 418 | if ($level == 0 && $coff < $soff) { | 438 | if ($level == 0 && $coff < $soff) { |
| 419 | $coff = $off; | 439 | $coff = $off; |
| 440 | $coff_set = 1; | ||
| 441 | #warn "CSB: mark coff<$coff>\n"; | ||
| 420 | } | 442 | } |
| 421 | } | 443 | } |
| 422 | if (($type eq '' || $type eq '{') && $c eq '{') { | 444 | if (($type eq '' || $type eq '{') && $c eq '{') { |
| @@ -444,7 +466,7 @@ sub ctx_statement_block { | |||
| 444 | #warn "STATEMENT<$statement>\n"; | 466 | #warn "STATEMENT<$statement>\n"; |
| 445 | #warn "CONDITION<$condition>\n"; | 467 | #warn "CONDITION<$condition>\n"; |
| 446 | 468 | ||
| 447 | #print "off<$off> loff<$loff>\n"; | 469 | #print "coff<$coff> soff<$off> loff<$loff>\n"; |
| 448 | 470 | ||
| 449 | return ($statement, $condition, | 471 | return ($statement, $condition, |
| 450 | $line, $remain + 1, $off - $loff + 1, $level); | 472 | $line, $remain + 1, $off - $loff + 1, $level); |
| @@ -502,7 +524,7 @@ sub ctx_statement_full { | |||
| 502 | # Grab the first conditional/block pair. | 524 | # Grab the first conditional/block pair. |
| 503 | ($statement, $condition, $linenr, $remain, $off, $level) = | 525 | ($statement, $condition, $linenr, $remain, $off, $level) = |
| 504 | ctx_statement_block($linenr, $remain, $off); | 526 | ctx_statement_block($linenr, $remain, $off); |
| 505 | #print "F: c<$condition> s<$statement>\n"; | 527 | #print "F: c<$condition> s<$statement> remain<$remain>\n"; |
| 506 | push(@chunks, [ $condition, $statement ]); | 528 | push(@chunks, [ $condition, $statement ]); |
| 507 | if (!($remain > 0 && $condition =~ /^\s*(?:\n[+-])?\s*(?:if|else|do)\b/s)) { | 529 | if (!($remain > 0 && $condition =~ /^\s*(?:\n[+-])?\s*(?:if|else|do)\b/s)) { |
| 508 | return ($level, $linenr, @chunks); | 530 | return ($level, $linenr, @chunks); |
| @@ -514,7 +536,7 @@ sub ctx_statement_full { | |||
| 514 | ($statement, $condition, $linenr, $remain, $off, $level) = | 536 | ($statement, $condition, $linenr, $remain, $off, $level) = |
| 515 | ctx_statement_block($linenr, $remain, $off); | 537 | ctx_statement_block($linenr, $remain, $off); |
| 516 | #print "C: c<$condition> s<$statement> remain<$remain>\n"; | 538 | #print "C: c<$condition> s<$statement> remain<$remain>\n"; |
| 517 | last if (!($remain > 0 && $condition =~ /^\s*(?:\n[+-])?\s*(?:else|do)\b/s)); | 539 | last if (!($remain > 0 && $condition =~ /^(?:\s*\n[+-])*\s*(?:else|do)\b/s)); |
| 518 | #print "C: push\n"; | 540 | #print "C: push\n"; |
| 519 | push(@chunks, [ $condition, $statement ]); | 541 | push(@chunks, [ $condition, $statement ]); |
| 520 | } | 542 | } |
| @@ -668,6 +690,7 @@ sub annotate_values { | |||
| 668 | print "$stream\n" if ($dbg_values > 1); | 690 | print "$stream\n" if ($dbg_values > 1); |
| 669 | 691 | ||
| 670 | while (length($cur)) { | 692 | while (length($cur)) { |
| 693 | @av_paren_type = ('E') if ($#av_paren_type < 0); | ||
| 671 | print " <" . join('', @av_paren_type) . | 694 | print " <" . join('', @av_paren_type) . |
| 672 | "> <$type> " if ($dbg_values > 1); | 695 | "> <$type> " if ($dbg_values > 1); |
| 673 | if ($cur =~ /^(\s+)/o) { | 696 | if ($cur =~ /^(\s+)/o) { |
| @@ -804,28 +827,34 @@ sub possible { | |||
| 804 | my $prefix = ''; | 827 | my $prefix = ''; |
| 805 | 828 | ||
| 806 | sub report { | 829 | sub report { |
| 830 | if (defined $tst_only && $_[0] !~ /\Q$tst_only\E/) { | ||
| 831 | return 0; | ||
| 832 | } | ||
| 807 | my $line = $prefix . $_[0]; | 833 | my $line = $prefix . $_[0]; |
| 808 | 834 | ||
| 809 | $line = (split('\n', $line))[0] . "\n" if ($terse); | 835 | $line = (split('\n', $line))[0] . "\n" if ($terse); |
| 810 | 836 | ||
| 811 | push(our @report, $line); | 837 | push(our @report, $line); |
| 838 | |||
| 839 | return 1; | ||
| 812 | } | 840 | } |
| 813 | sub report_dump { | 841 | sub report_dump { |
| 814 | our @report; | 842 | our @report; |
| 815 | } | 843 | } |
| 816 | sub ERROR { | 844 | sub ERROR { |
| 817 | report("ERROR: $_[0]\n"); | 845 | if (report("ERROR: $_[0]\n")) { |
| 818 | our $clean = 0; | 846 | our $clean = 0; |
| 819 | our $cnt_error++; | 847 | our $cnt_error++; |
| 848 | } | ||
| 820 | } | 849 | } |
| 821 | sub WARN { | 850 | sub WARN { |
| 822 | report("WARNING: $_[0]\n"); | 851 | if (report("WARNING: $_[0]\n")) { |
| 823 | our $clean = 0; | 852 | our $clean = 0; |
| 824 | our $cnt_warn++; | 853 | our $cnt_warn++; |
| 854 | } | ||
| 825 | } | 855 | } |
| 826 | sub CHK { | 856 | sub CHK { |
| 827 | if ($check) { | 857 | if ($check && report("CHECK: $_[0]\n")) { |
| 828 | report("CHECK: $_[0]\n"); | ||
| 829 | our $clean = 0; | 858 | our $clean = 0; |
| 830 | our $cnt_chk++; | 859 | our $cnt_chk++; |
| 831 | } | 860 | } |
| @@ -867,30 +896,76 @@ sub process { | |||
| 867 | my $prev_values = 'E'; | 896 | my $prev_values = 'E'; |
| 868 | 897 | ||
| 869 | # suppression flags | 898 | # suppression flags |
| 870 | my $suppress_ifbraces = 0; | 899 | my %suppress_ifbraces; |
| 871 | 900 | ||
| 872 | # Pre-scan the patch sanitizing the lines. | 901 | # Pre-scan the patch sanitizing the lines. |
| 873 | # Pre-scan the patch looking for any __setup documentation. | 902 | # Pre-scan the patch looking for any __setup documentation. |
| 874 | # | 903 | # |
| 875 | my @setup_docs = (); | 904 | my @setup_docs = (); |
| 876 | my $setup_docs = 0; | 905 | my $setup_docs = 0; |
| 906 | |||
| 907 | sanitise_line_reset(); | ||
| 877 | my $line; | 908 | my $line; |
| 878 | foreach my $rawline (@rawlines) { | 909 | foreach my $rawline (@rawlines) { |
| 879 | # Standardise the strings and chars within the input to | 910 | $linenr++; |
| 880 | # simplify matching. | 911 | $line = $rawline; |
| 881 | $line = sanitise_line($rawline); | ||
| 882 | push(@lines, $line); | ||
| 883 | |||
| 884 | ##print "==>$rawline\n"; | ||
| 885 | ##print "-->$line\n"; | ||
| 886 | 912 | ||
| 887 | if ($line=~/^\+\+\+\s+(\S+)/) { | 913 | if ($rawline=~/^\+\+\+\s+(\S+)/) { |
| 888 | $setup_docs = 0; | 914 | $setup_docs = 0; |
| 889 | if ($1 =~ m@Documentation/kernel-parameters.txt$@) { | 915 | if ($1 =~ m@Documentation/kernel-parameters.txt$@) { |
| 890 | $setup_docs = 1; | 916 | $setup_docs = 1; |
| 891 | } | 917 | } |
| 892 | next; | 918 | #next; |
| 919 | } | ||
| 920 | if ($rawline=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) { | ||
| 921 | $realline=$1-1; | ||
| 922 | if (defined $2) { | ||
| 923 | $realcnt=$3+1; | ||
| 924 | } else { | ||
| 925 | $realcnt=1+1; | ||
| 926 | } | ||
| 927 | |||
| 928 | # Guestimate if this is a continuing comment. Run | ||
| 929 | # the context looking for a comment "edge". If this | ||
| 930 | # edge is a close comment then we must be in a comment | ||
| 931 | # at context start. | ||
| 932 | my $edge; | ||
| 933 | for (my $ln = $linenr; $ln < ($linenr + $realcnt); $ln++) { | ||
| 934 | next if ($line =~ /^-/); | ||
| 935 | ($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@); | ||
| 936 | last if (defined $edge); | ||
| 937 | } | ||
| 938 | if (defined $edge && $edge eq '*/') { | ||
| 939 | $in_comment = 1; | ||
| 940 | } | ||
| 941 | |||
| 942 | # Guestimate if this is a continuing comment. If this | ||
| 943 | # is the start of a diff block and this line starts | ||
| 944 | # ' *' then it is very likely a comment. | ||
| 945 | if (!defined $edge && | ||
| 946 | $rawlines[$linenr] =~ m@^.\s* \*(?:\s|$)@) | ||
| 947 | { | ||
| 948 | $in_comment = 1; | ||
| 949 | } | ||
| 950 | |||
| 951 | ##print "COMMENT:$in_comment edge<$edge> $rawline\n"; | ||
| 952 | sanitise_line_reset($in_comment); | ||
| 953 | |||
| 954 | } elsif ($realcnt) { | ||
| 955 | # Standardise the strings and chars within the input to | ||
| 956 | # simplify matching. | ||
| 957 | $line = sanitise_line($rawline); | ||
| 893 | } | 958 | } |
| 959 | push(@lines, $line); | ||
| 960 | |||
| 961 | if ($realcnt > 1) { | ||
| 962 | $realcnt-- if ($line =~ /^(?:\+| |$)/); | ||
| 963 | } else { | ||
| 964 | $realcnt = 0; | ||
| 965 | } | ||
| 966 | |||
| 967 | #print "==>$rawline\n"; | ||
| 968 | #print "-->$line\n"; | ||
| 894 | 969 | ||
| 895 | if ($setup_docs && $line =~ /^\+/) { | 970 | if ($setup_docs && $line =~ /^\+/) { |
| 896 | push(@setup_docs, $line); | 971 | push(@setup_docs, $line); |
| @@ -899,23 +974,17 @@ sub process { | |||
| 899 | 974 | ||
| 900 | $prefix = ''; | 975 | $prefix = ''; |
| 901 | 976 | ||
| 977 | $realcnt = 0; | ||
| 978 | $linenr = 0; | ||
| 902 | foreach my $line (@lines) { | 979 | foreach my $line (@lines) { |
| 903 | $linenr++; | 980 | $linenr++; |
| 904 | 981 | ||
| 905 | my $rawline = $rawlines[$linenr - 1]; | 982 | my $rawline = $rawlines[$linenr - 1]; |
| 906 | 983 | ||
| 907 | #extract the filename as it passes | ||
| 908 | if ($line=~/^\+\+\+\s+(\S+)/) { | ||
| 909 | $realfile=$1; | ||
| 910 | $realfile =~ s@^[^/]*/@@; | ||
| 911 | $in_comment = 0; | ||
| 912 | next; | ||
| 913 | } | ||
| 914 | #extract the line range in the file after the patch is applied | 984 | #extract the line range in the file after the patch is applied |
| 915 | if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) { | 985 | if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) { |
| 916 | $is_patch = 1; | 986 | $is_patch = 1; |
| 917 | $first_line = $linenr + 1; | 987 | $first_line = $linenr + 1; |
| 918 | $in_comment = 0; | ||
| 919 | $realline=$1-1; | 988 | $realline=$1-1; |
| 920 | if (defined $2) { | 989 | if (defined $2) { |
| 921 | $realcnt=$3+1; | 990 | $realcnt=$3+1; |
| @@ -925,50 +994,16 @@ sub process { | |||
| 925 | annotate_reset(); | 994 | annotate_reset(); |
| 926 | $prev_values = 'E'; | 995 | $prev_values = 'E'; |
| 927 | 996 | ||
| 928 | $suppress_ifbraces = $linenr - 1; | 997 | %suppress_ifbraces = (); |
| 929 | next; | 998 | next; |
| 930 | } | ||
| 931 | 999 | ||
| 932 | # track the line number as we move through the hunk, note that | 1000 | # track the line number as we move through the hunk, note that |
| 933 | # new versions of GNU diff omit the leading space on completely | 1001 | # new versions of GNU diff omit the leading space on completely |
| 934 | # blank context lines so we need to count that too. | 1002 | # blank context lines so we need to count that too. |
| 935 | if ($line =~ /^( |\+|$)/) { | 1003 | } elsif ($line =~ /^( |\+|$)/) { |
| 936 | $realline++; | 1004 | $realline++; |
| 937 | $realcnt-- if ($realcnt != 0); | 1005 | $realcnt-- if ($realcnt != 0); |
| 938 | 1006 | ||
| 939 | # Guestimate if this is a continuing comment. Run | ||
| 940 | # the context looking for a comment "edge". If this | ||
| 941 | # edge is a close comment then we must be in a comment | ||
| 942 | # at context start. | ||
| 943 | if ($linenr == $first_line) { | ||
| 944 | my $edge; | ||
| 945 | for (my $ln = $first_line; $ln < ($linenr + $realcnt); $ln++) { | ||
| 946 | ($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@); | ||
| 947 | last if (defined $edge); | ||
| 948 | } | ||
| 949 | if (defined $edge && $edge eq '*/') { | ||
| 950 | $in_comment = 1; | ||
| 951 | } | ||
| 952 | } | ||
| 953 | |||
| 954 | # Guestimate if this is a continuing comment. If this | ||
| 955 | # is the start of a diff block and this line starts | ||
| 956 | # ' *' then it is very likely a comment. | ||
| 957 | if ($linenr == $first_line and $rawline =~ m@^.\s* \*(?:\s|$)@) { | ||
| 958 | $in_comment = 1; | ||
| 959 | } | ||
| 960 | |||
| 961 | # Find the last comment edge on _this_ line. | ||
| 962 | $comment_edge = 0; | ||
| 963 | while (($rawline =~ m@(/\*|\*/)@g)) { | ||
| 964 | if ($1 eq '/*') { | ||
| 965 | $in_comment = 1; | ||
| 966 | } else { | ||
| 967 | $in_comment = 0; | ||
| 968 | } | ||
| 969 | $comment_edge = 1; | ||
| 970 | } | ||
| 971 | |||
| 972 | # Measure the line length and indent. | 1007 | # Measure the line length and indent. |
| 973 | ($length, $indent) = line_stats($rawline); | 1008 | ($length, $indent) = line_stats($rawline); |
| 974 | 1009 | ||
| @@ -977,23 +1012,36 @@ sub process { | |||
| 977 | ($previndent, $stashindent) = ($stashindent, $indent); | 1012 | ($previndent, $stashindent) = ($stashindent, $indent); |
| 978 | ($prevrawline, $stashrawline) = ($stashrawline, $rawline); | 1013 | ($prevrawline, $stashrawline) = ($stashrawline, $rawline); |
| 979 | 1014 | ||
| 980 | #warn "ic<$in_comment> ce<$comment_edge> line<$line>\n"; | 1015 | #warn "line<$line>\n"; |
| 981 | 1016 | ||
| 982 | } elsif ($realcnt == 1) { | 1017 | } elsif ($realcnt == 1) { |
| 983 | $realcnt--; | 1018 | $realcnt--; |
| 984 | } | 1019 | } |
| 985 | 1020 | ||
| 986 | #make up the handle for any error we report on this line | 1021 | #make up the handle for any error we report on this line |
| 1022 | $prefix = "$filename:$realline: " if ($emacs && $file); | ||
| 1023 | $prefix = "$filename:$linenr: " if ($emacs && !$file); | ||
| 1024 | |||
| 987 | $here = "#$linenr: " if (!$file); | 1025 | $here = "#$linenr: " if (!$file); |
| 988 | $here = "#$realline: " if ($file); | 1026 | $here = "#$realline: " if ($file); |
| 1027 | |||
| 1028 | # extract the filename as it passes | ||
| 1029 | if ($line=~/^\+\+\+\s+(\S+)/) { | ||
| 1030 | $realfile = $1; | ||
| 1031 | $realfile =~ s@^[^/]*/@@; | ||
| 1032 | |||
| 1033 | if ($realfile =~ m@include/asm/@) { | ||
| 1034 | ERROR("do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n"); | ||
| 1035 | } | ||
| 1036 | next; | ||
| 1037 | } | ||
| 1038 | |||
| 989 | $here .= "FILE: $realfile:$realline:" if ($realcnt != 0); | 1039 | $here .= "FILE: $realfile:$realline:" if ($realcnt != 0); |
| 990 | 1040 | ||
| 991 | my $hereline = "$here\n$rawline\n"; | 1041 | my $hereline = "$here\n$rawline\n"; |
| 992 | my $herecurr = "$here\n$rawline\n"; | 1042 | my $herecurr = "$here\n$rawline\n"; |
| 993 | my $hereprev = "$here\n$prevrawline\n$rawline\n"; | 1043 | my $hereprev = "$here\n$prevrawline\n$rawline\n"; |
| 994 | 1044 | ||
| 995 | $prefix = "$filename:$realline: " if ($emacs && $file); | ||
| 996 | $prefix = "$filename:$linenr: " if ($emacs && !$file); | ||
| 997 | $cnt_lines++ if ($realcnt != 0); | 1045 | $cnt_lines++ if ($realcnt != 0); |
| 998 | 1046 | ||
| 999 | #check the patch for a signoff: | 1047 | #check the patch for a signoff: |
| @@ -1005,7 +1053,7 @@ sub process { | |||
| 1005 | $herecurr); | 1053 | $herecurr); |
| 1006 | } | 1054 | } |
| 1007 | if ($line =~ /^\s*signed-off-by:\S/i) { | 1055 | if ($line =~ /^\s*signed-off-by:\S/i) { |
| 1008 | WARN("need space after Signed-off-by:\n" . | 1056 | WARN("space required after Signed-off-by:\n" . |
| 1009 | $herecurr); | 1057 | $herecurr); |
| 1010 | } | 1058 | } |
| 1011 | } | 1059 | } |
| @@ -1072,11 +1120,6 @@ sub process { | |||
| 1072 | WARN("CVS style keyword markers, these will _not_ be updated\n". $herecurr); | 1120 | WARN("CVS style keyword markers, these will _not_ be updated\n". $herecurr); |
| 1073 | } | 1121 | } |
| 1074 | 1122 | ||
| 1075 | # The rest of our checks refer specifically to C style | ||
| 1076 | # only apply those _outside_ comments. Only skip | ||
| 1077 | # lines in the middle of comments. | ||
| 1078 | next if (!$comment_edge && $in_comment); | ||
| 1079 | |||
| 1080 | # Check for potential 'bare' types | 1123 | # Check for potential 'bare' types |
| 1081 | if ($realcnt) { | 1124 | if ($realcnt) { |
| 1082 | my ($s, $c) = ctx_statement_block($linenr, $realcnt, 0); | 1125 | my ($s, $c) = ctx_statement_block($linenr, $realcnt, 0); |
| @@ -1110,7 +1153,7 @@ sub process { | |||
| 1110 | my ($name_len) = length($1); | 1153 | my ($name_len) = length($1); |
| 1111 | 1154 | ||
| 1112 | my $ctx = $s; | 1155 | my $ctx = $s; |
| 1113 | substr($ctx, 0, $name_len + 1) = ''; | 1156 | substr($ctx, 0, $name_len + 1, ''); |
| 1114 | $ctx =~ s/\)[^\)]*$//; | 1157 | $ctx =~ s/\)[^\)]*$//; |
| 1115 | 1158 | ||
| 1116 | for my $arg (split(/\s*,\s*/, $ctx)) { | 1159 | for my $arg (split(/\s*,\s*/, $ctx)) { |
| @@ -1151,27 +1194,33 @@ sub process { | |||
| 1151 | 1194 | ||
| 1152 | # if/while/etc brace do not go on next line, unless defining a do while loop, | 1195 | # if/while/etc brace do not go on next line, unless defining a do while loop, |
| 1153 | # or if that brace on the next line is for something else | 1196 | # or if that brace on the next line is for something else |
| 1154 | if ($line =~ /\b(?:(if|while|for|switch)\s*\(|do\b|else\b)/ && $line !~ /^.#/) { | 1197 | if ($line =~ /(.*)\b((?:if|while|for|switch)\s*\(|do\b|else\b)/ && $line !~ /^.#/) { |
| 1198 | my $pre_ctx = "$1$2"; | ||
| 1199 | |||
| 1155 | my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0); | 1200 | my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0); |
| 1156 | my $ctx_ln = $linenr + $#ctx + 1; | 1201 | my $ctx_ln = $linenr + $#ctx + 1; |
| 1157 | my $ctx_cnt = $realcnt - $#ctx - 1; | 1202 | my $ctx_cnt = $realcnt - $#ctx - 1; |
| 1158 | my $ctx = join("\n", @ctx); | 1203 | my $ctx = join("\n", @ctx); |
| 1159 | 1204 | ||
| 1205 | ##warn "realcnt<$realcnt> ctx_cnt<$ctx_cnt>\n"; | ||
| 1206 | |||
| 1160 | # Skip over any removed lines in the context following statement. | 1207 | # Skip over any removed lines in the context following statement. |
| 1161 | while ($ctx_cnt > 0 && $lines[$ctx_ln - 1] =~ /^-/) { | 1208 | while (defined($lines[$ctx_ln - 1]) && $lines[$ctx_ln - 1] =~ /^-/) { |
| 1162 | $ctx_ln++; | 1209 | $ctx_ln++; |
| 1163 | $ctx_cnt--; | ||
| 1164 | } | 1210 | } |
| 1165 | ##warn "line<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>"; | 1211 | ##warn "pre<$pre_ctx>\nline<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>\n"; |
| 1166 | 1212 | ||
| 1167 | if ($ctx !~ /{\s*/ && $ctx_cnt > 0 && $lines[$ctx_ln - 1] =~ /^\+\s*{/) { | 1213 | if ($ctx !~ /{\s*/ && defined($lines[$ctx_ln -1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/) { |
| 1168 | ERROR("That open brace { should be on the previous line\n" . | 1214 | ERROR("that open brace { should be on the previous line\n" . |
| 1169 | "$here\n$ctx\n$lines[$ctx_ln - 1]"); | 1215 | "$here\n$ctx\n$lines[$ctx_ln - 1]"); |
| 1170 | } | 1216 | } |
| 1171 | if ($level == 0 && $ctx =~ /\)\s*\;\s*$/ && defined $lines[$ctx_ln - 1]) { | 1217 | if ($level == 0 && $pre_ctx !~ /}\s*while\s*\($/ && |
| 1218 | $ctx =~ /\)\s*\;\s*$/ && | ||
| 1219 | defined $lines[$ctx_ln - 1]) | ||
| 1220 | { | ||
| 1172 | my ($nlength, $nindent) = line_stats($lines[$ctx_ln - 1]); | 1221 | my ($nlength, $nindent) = line_stats($lines[$ctx_ln - 1]); |
| 1173 | if ($nindent > $indent) { | 1222 | if ($nindent > $indent) { |
| 1174 | WARN("Trailing semicolon indicates no statements, indent implies otherwise\n" . | 1223 | WARN("trailing semicolon indicates no statements, indent implies otherwise\n" . |
| 1175 | "$here\n$ctx\n$lines[$ctx_ln - 1]"); | 1224 | "$here\n$ctx\n$lines[$ctx_ln - 1]"); |
| 1176 | } | 1225 | } |
| 1177 | } | 1226 | } |
| @@ -1200,7 +1249,7 @@ sub process { | |||
| 1200 | # check for initialisation to aggregates open brace on the next line | 1249 | # check for initialisation to aggregates open brace on the next line |
| 1201 | if ($prevline =~ /$Declare\s*$Ident\s*=\s*$/ && | 1250 | if ($prevline =~ /$Declare\s*$Ident\s*=\s*$/ && |
| 1202 | $line =~ /^.\s*{/) { | 1251 | $line =~ /^.\s*{/) { |
| 1203 | ERROR("That open brace { should be on the previous line\n" . $hereprev); | 1252 | ERROR("that open brace { should be on the previous line\n" . $hereprev); |
| 1204 | } | 1253 | } |
| 1205 | 1254 | ||
| 1206 | # | 1255 | # |
| @@ -1325,22 +1374,31 @@ sub process { | |||
| 1325 | # check for spaces between functions and their parentheses. | 1374 | # check for spaces between functions and their parentheses. |
| 1326 | while ($line =~ /($Ident)\s+\(/g) { | 1375 | while ($line =~ /($Ident)\s+\(/g) { |
| 1327 | my $name = $1; | 1376 | my $name = $1; |
| 1328 | my $ctx = substr($line, 0, $-[1]); | 1377 | my $ctx_before = substr($line, 0, $-[1]); |
| 1378 | my $ctx = "$ctx_before$name"; | ||
| 1329 | 1379 | ||
| 1330 | # Ignore those directives where spaces _are_ permitted. | 1380 | # Ignore those directives where spaces _are_ permitted. |
| 1331 | if ($name =~ /^(?:if|for|while|switch|return|volatile|__volatile__|__attribute__|format|__extension__|Copyright|case|__asm__)$/) { | 1381 | if ($name =~ /^(?: |
| 1382 | if|for|while|switch|return|case| | ||
| 1383 | volatile|__volatile__| | ||
| 1384 | __attribute__|format|__extension__| | ||
| 1385 | asm|__asm__)$/x) | ||
| 1386 | { | ||
| 1332 | 1387 | ||
| 1333 | # cpp #define statements have non-optional spaces, ie | 1388 | # cpp #define statements have non-optional spaces, ie |
| 1334 | # if there is a space between the name and the open | 1389 | # if there is a space between the name and the open |
| 1335 | # parenthesis it is simply not a parameter group. | 1390 | # parenthesis it is simply not a parameter group. |
| 1336 | } elsif ($ctx =~ /^.\#\s*define\s*$/) { | 1391 | } elsif ($ctx_before =~ /^.\#\s*define\s*$/) { |
| 1392 | |||
| 1393 | # cpp #elif statement condition may start with a ( | ||
| 1394 | } elsif ($ctx =~ /^.\#\s*elif\s*$/) { | ||
| 1337 | 1395 | ||
| 1338 | # If this whole things ends with a type its most | 1396 | # If this whole things ends with a type its most |
| 1339 | # likely a typedef for a function. | 1397 | # likely a typedef for a function. |
| 1340 | } elsif ("$ctx$name" =~ /$Type$/) { | 1398 | } elsif ($ctx =~ /$Type$/) { |
| 1341 | 1399 | ||
| 1342 | } else { | 1400 | } else { |
| 1343 | WARN("no space between function name and open parenthesis '('\n" . $herecurr); | 1401 | WARN("space prohibited between function name and open parenthesis '('\n" . $herecurr); |
| 1344 | } | 1402 | } |
| 1345 | } | 1403 | } |
| 1346 | # Check operator spacing. | 1404 | # Check operator spacing. |
| @@ -1359,13 +1417,21 @@ sub process { | |||
| 1359 | for (my $n = 0; $n < $#elements; $n += 2) { | 1417 | for (my $n = 0; $n < $#elements; $n += 2) { |
| 1360 | $off += length($elements[$n]); | 1418 | $off += length($elements[$n]); |
| 1361 | 1419 | ||
| 1420 | # Pick up the preceeding and succeeding characters. | ||
| 1421 | my $ca = substr($opline, 0, $off); | ||
| 1422 | my $cc = ''; | ||
| 1423 | if (length($opline) >= ($off + length($elements[$n + 1]))) { | ||
| 1424 | $cc = substr($opline, $off + length($elements[$n + 1])); | ||
| 1425 | } | ||
| 1426 | my $cb = "$ca$;$cc"; | ||
| 1427 | |||
| 1362 | my $a = ''; | 1428 | my $a = ''; |
| 1363 | $a = 'V' if ($elements[$n] ne ''); | 1429 | $a = 'V' if ($elements[$n] ne ''); |
| 1364 | $a = 'W' if ($elements[$n] =~ /\s$/); | 1430 | $a = 'W' if ($elements[$n] =~ /\s$/); |
| 1365 | $a = 'C' if ($elements[$n] =~ /$;$/); | 1431 | $a = 'C' if ($elements[$n] =~ /$;$/); |
| 1366 | $a = 'B' if ($elements[$n] =~ /(\[|\()$/); | 1432 | $a = 'B' if ($elements[$n] =~ /(\[|\()$/); |
| 1367 | $a = 'O' if ($elements[$n] eq ''); | 1433 | $a = 'O' if ($elements[$n] eq ''); |
| 1368 | $a = 'E' if ($elements[$n] eq '' && $n == 0); | 1434 | $a = 'E' if ($ca =~ /^\s*$/); |
| 1369 | 1435 | ||
| 1370 | my $op = $elements[$n + 1]; | 1436 | my $op = $elements[$n + 1]; |
| 1371 | 1437 | ||
| @@ -1381,14 +1447,6 @@ sub process { | |||
| 1381 | $c = 'E'; | 1447 | $c = 'E'; |
| 1382 | } | 1448 | } |
| 1383 | 1449 | ||
| 1384 | # Pick up the preceeding and succeeding characters. | ||
| 1385 | my $ca = substr($opline, 0, $off); | ||
| 1386 | my $cc = ''; | ||
| 1387 | if (length($opline) >= ($off + length($elements[$n + 1]))) { | ||
| 1388 | $cc = substr($opline, $off + length($elements[$n + 1])); | ||
| 1389 | } | ||
| 1390 | my $cb = "$ca$;$cc"; | ||
| 1391 | |||
| 1392 | my $ctx = "${a}x${c}"; | 1450 | my $ctx = "${a}x${c}"; |
| 1393 | 1451 | ||
| 1394 | my $at = "(ctx:$ctx)"; | 1452 | my $at = "(ctx:$ctx)"; |
| @@ -1424,7 +1482,7 @@ sub process { | |||
| 1424 | } elsif ($op eq ';') { | 1482 | } elsif ($op eq ';') { |
| 1425 | if ($ctx !~ /.x[WEBC]/ && | 1483 | if ($ctx !~ /.x[WEBC]/ && |
| 1426 | $cc !~ /^\\/ && $cc !~ /^;/) { | 1484 | $cc !~ /^\\/ && $cc !~ /^;/) { |
| 1427 | ERROR("need space after that '$op' $at\n" . $hereptr); | 1485 | ERROR("space required after that '$op' $at\n" . $hereptr); |
| 1428 | } | 1486 | } |
| 1429 | 1487 | ||
| 1430 | # // is a comment | 1488 | # // is a comment |
| @@ -1433,13 +1491,13 @@ sub process { | |||
| 1433 | # -> should have no spaces | 1491 | # -> should have no spaces |
| 1434 | } elsif ($op eq '->') { | 1492 | } elsif ($op eq '->') { |
| 1435 | if ($ctx =~ /Wx.|.xW/) { | 1493 | if ($ctx =~ /Wx.|.xW/) { |
| 1436 | ERROR("no spaces around that '$op' $at\n" . $hereptr); | 1494 | ERROR("spaces prohibited around that '$op' $at\n" . $hereptr); |
| 1437 | } | 1495 | } |
| 1438 | 1496 | ||
| 1439 | # , must have a space on the right. | 1497 | # , must have a space on the right. |
| 1440 | } elsif ($op eq ',') { | 1498 | } elsif ($op eq ',') { |
| 1441 | if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/) { | 1499 | if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/) { |
| 1442 | ERROR("need space after that '$op' $at\n" . $hereptr); | 1500 | ERROR("space required after that '$op' $at\n" . $hereptr); |
| 1443 | } | 1501 | } |
| 1444 | 1502 | ||
| 1445 | # '*' as part of a type definition -- reported already. | 1503 | # '*' as part of a type definition -- reported already. |
| @@ -1452,21 +1510,26 @@ sub process { | |||
| 1452 | } elsif ($op eq '!' || $op eq '~' || | 1510 | } elsif ($op eq '!' || $op eq '~' || |
| 1453 | ($is_unary && ($op eq '*' || $op eq '-' || $op eq '&'))) { | 1511 | ($is_unary && ($op eq '*' || $op eq '-' || $op eq '&'))) { |
| 1454 | if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) { | 1512 | if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) { |
| 1455 | ERROR("need space before that '$op' $at\n" . $hereptr); | 1513 | ERROR("space required before that '$op' $at\n" . $hereptr); |
| 1456 | } | 1514 | } |
| 1457 | if ($ctx =~ /.xW/) { | 1515 | if ($ctx =~ /.xW/) { |
| 1458 | ERROR("no space after that '$op' $at\n" . $hereptr); | 1516 | ERROR("space prohibited after that '$op' $at\n" . $hereptr); |
| 1459 | } | 1517 | } |
| 1460 | 1518 | ||
| 1461 | # unary ++ and unary -- are allowed no space on one side. | 1519 | # unary ++ and unary -- are allowed no space on one side. |
| 1462 | } elsif ($op eq '++' or $op eq '--') { | 1520 | } elsif ($op eq '++' or $op eq '--') { |
| 1463 | if ($ctx !~ /[WOBC]x[^W]/ && $ctx !~ /[^W]x[WOBEC]/) { | 1521 | if ($ctx !~ /[WEOBC]x[^W]/ && $ctx !~ /[^W]x[WOBEC]/) { |
| 1464 | ERROR("need space one side of that '$op' $at\n" . $hereptr); | 1522 | ERROR("space required one side of that '$op' $at\n" . $hereptr); |
| 1523 | } | ||
| 1524 | if ($ctx =~ /Wx[BE]/ || | ||
| 1525 | ($ctx =~ /Wx./ && $cc =~ /^;/)) { | ||
| 1526 | ERROR("space prohibited before that '$op' $at\n" . $hereptr); | ||
| 1465 | } | 1527 | } |
| 1466 | if ($ctx =~ /WxB/ || ($ctx =~ /Wx./ && $cc =~ /^;/)) { | 1528 | if ($ctx =~ /ExW/) { |
| 1467 | ERROR("no space before that '$op' $at\n" . $hereptr); | 1529 | ERROR("space prohibited after that '$op' $at\n" . $hereptr); |
| 1468 | } | 1530 | } |
| 1469 | 1531 | ||
| 1532 | |||
| 1470 | # << and >> may either have or not have spaces both sides | 1533 | # << and >> may either have or not have spaces both sides |
| 1471 | } elsif ($op eq '<<' or $op eq '>>' or | 1534 | } elsif ($op eq '<<' or $op eq '>>' or |
| 1472 | $op eq '&' or $op eq '^' or $op eq '|' or | 1535 | $op eq '&' or $op eq '^' or $op eq '|' or |
| @@ -1474,7 +1537,7 @@ sub process { | |||
| 1474 | $op eq '*' or $op eq '/' or | 1537 | $op eq '*' or $op eq '/' or |
| 1475 | $op eq '%') | 1538 | $op eq '%') |
| 1476 | { | 1539 | { |
| 1477 | if ($ctx !~ /VxV|WxW|VxE|WxE|VxO|Cx.|.xC/) { | 1540 | if ($ctx =~ /Wx[^WCE]|[^WCE]xW/) { |
| 1478 | ERROR("need consistent spacing around '$op' $at\n" . | 1541 | ERROR("need consistent spacing around '$op' $at\n" . |
| 1479 | $hereptr); | 1542 | $hereptr); |
| 1480 | } | 1543 | } |
| @@ -1484,7 +1547,7 @@ sub process { | |||
| 1484 | # Ignore email addresses <foo@bar> | 1547 | # Ignore email addresses <foo@bar> |
| 1485 | if (!($op eq '<' && $cb =~ /$;\S+\@\S+>/) && | 1548 | if (!($op eq '<' && $cb =~ /$;\S+\@\S+>/) && |
| 1486 | !($op eq '>' && $cb =~ /<\S+\@\S+$;/)) { | 1549 | !($op eq '>' && $cb =~ /<\S+\@\S+$;/)) { |
| 1487 | ERROR("need spaces around that '$op' $at\n" . $hereptr); | 1550 | ERROR("spaces required around that '$op' $at\n" . $hereptr); |
| 1488 | } | 1551 | } |
| 1489 | } | 1552 | } |
| 1490 | $off += length($elements[$n + 1]); | 1553 | $off += length($elements[$n + 1]); |
| @@ -1514,31 +1577,31 @@ sub process { | |||
| 1514 | #need space before brace following if, while, etc | 1577 | #need space before brace following if, while, etc |
| 1515 | if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) || | 1578 | if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) || |
| 1516 | $line =~ /do{/) { | 1579 | $line =~ /do{/) { |
| 1517 | ERROR("need a space before the open brace '{'\n" . $herecurr); | 1580 | ERROR("space required before the open brace '{'\n" . $herecurr); |
| 1518 | } | 1581 | } |
| 1519 | 1582 | ||
| 1520 | # closing brace should have a space following it when it has anything | 1583 | # closing brace should have a space following it when it has anything |
| 1521 | # on the line | 1584 | # on the line |
| 1522 | if ($line =~ /}(?!(?:,|;|\)))\S/) { | 1585 | if ($line =~ /}(?!(?:,|;|\)))\S/) { |
| 1523 | ERROR("need a space after that close brace '}'\n" . $herecurr); | 1586 | ERROR("space required after that close brace '}'\n" . $herecurr); |
| 1524 | } | 1587 | } |
| 1525 | 1588 | ||
| 1526 | # check spacing on square brackets | 1589 | # check spacing on square brackets |
| 1527 | if ($line =~ /\[\s/ && $line !~ /\[\s*$/) { | 1590 | if ($line =~ /\[\s/ && $line !~ /\[\s*$/) { |
| 1528 | ERROR("no space after that open square bracket '['\n" . $herecurr); | 1591 | ERROR("space prohibited after that open square bracket '['\n" . $herecurr); |
| 1529 | } | 1592 | } |
| 1530 | if ($line =~ /\s\]/) { | 1593 | if ($line =~ /\s\]/) { |
| 1531 | ERROR("no space before that close square bracket ']'\n" . $herecurr); | 1594 | ERROR("space prohibited before that close square bracket ']'\n" . $herecurr); |
| 1532 | } | 1595 | } |
| 1533 | 1596 | ||
| 1534 | # check spacing on paretheses | 1597 | # check spacing on paretheses |
| 1535 | if ($line =~ /\(\s/ && $line !~ /\(\s*(?:\\)?$/ && | 1598 | if ($line =~ /\(\s/ && $line !~ /\(\s*(?:\\)?$/ && |
| 1536 | $line !~ /for\s*\(\s+;/) { | 1599 | $line !~ /for\s*\(\s+;/) { |
| 1537 | ERROR("no space after that open parenthesis '('\n" . $herecurr); | 1600 | ERROR("space prohibited after that open parenthesis '('\n" . $herecurr); |
| 1538 | } | 1601 | } |
| 1539 | if ($line =~ /(\s+)\)/ && $line !~ /^.\s*\)/ && | 1602 | if ($line =~ /(\s+)\)/ && $line !~ /^.\s*\)/ && |
| 1540 | $line !~ /for\s*\(.*;\s+\)/) { | 1603 | $line !~ /for\s*\(.*;\s+\)/) { |
| 1541 | ERROR("no space before that close parenthesis ')'\n" . $herecurr); | 1604 | ERROR("space prohibited before that close parenthesis ')'\n" . $herecurr); |
| 1542 | } | 1605 | } |
| 1543 | 1606 | ||
| 1544 | #goto labels aren't indented, allow a single space however | 1607 | #goto labels aren't indented, allow a single space however |
| @@ -1549,7 +1612,7 @@ sub process { | |||
| 1549 | 1612 | ||
| 1550 | # Need a space before open parenthesis after if, while etc | 1613 | # Need a space before open parenthesis after if, while etc |
| 1551 | if ($line=~/\b(if|while|for|switch)\(/) { | 1614 | if ($line=~/\b(if|while|for|switch)\(/) { |
| 1552 | ERROR("need a space before the open parenthesis '('\n" . $herecurr); | 1615 | ERROR("space required before the open parenthesis '('\n" . $herecurr); |
| 1553 | } | 1616 | } |
| 1554 | 1617 | ||
| 1555 | # Check for illegal assignment in if conditional. | 1618 | # Check for illegal assignment in if conditional. |
| @@ -1562,10 +1625,12 @@ sub process { | |||
| 1562 | 1625 | ||
| 1563 | # Find out what is on the end of the line after the | 1626 | # Find out what is on the end of the line after the |
| 1564 | # conditional. | 1627 | # conditional. |
| 1565 | substr($s, 0, length($c)) = ''; | 1628 | substr($s, 0, length($c), ''); |
| 1566 | $s =~ s/\n.*//g; | 1629 | $s =~ s/\n.*//g; |
| 1567 | $s =~ s/$;//g; # Remove any comments | 1630 | $s =~ s/$;//g; # Remove any comments |
| 1568 | if (length($c) && $s !~ /^\s*({|;|)\s*\\*\s*$/) { | 1631 | if (length($c) && $s !~ /^\s*({|;|)\s*\\*\s*$/ && |
| 1632 | $c !~ /^.\#\s*if/) | ||
| 1633 | { | ||
| 1569 | ERROR("trailing statements should be on next line\n" . $herecurr); | 1634 | ERROR("trailing statements should be on next line\n" . $herecurr); |
| 1570 | } | 1635 | } |
| 1571 | } | 1636 | } |
| @@ -1607,7 +1672,7 @@ sub process { | |||
| 1607 | 1672 | ||
| 1608 | # Find out what is on the end of the line after the | 1673 | # Find out what is on the end of the line after the |
| 1609 | # conditional. | 1674 | # conditional. |
| 1610 | substr($s, 0, length($c)) = ''; | 1675 | substr($s, 0, length($c), ''); |
| 1611 | $s =~ s/\n.*//g; | 1676 | $s =~ s/\n.*//g; |
| 1612 | 1677 | ||
| 1613 | if ($s =~ /^\s*;/) { | 1678 | if ($s =~ /^\s*;/) { |
| @@ -1631,7 +1696,7 @@ sub process { | |||
| 1631 | if ($tree && $rawline =~ m{^.\#\s*include\s*\<asm\/(.*)\.h\>}) { | 1696 | if ($tree && $rawline =~ m{^.\#\s*include\s*\<asm\/(.*)\.h\>}) { |
| 1632 | my $checkfile = "$root/include/linux/$1.h"; | 1697 | my $checkfile = "$root/include/linux/$1.h"; |
| 1633 | if (-f $checkfile && $1 ne 'irq.h') { | 1698 | if (-f $checkfile && $1 ne 'irq.h') { |
| 1634 | CHK("Use #include <linux/$1.h> instead of <asm/$1.h>\n" . | 1699 | WARN("Use #include <linux/$1.h> instead of <asm/$1.h>\n" . |
| 1635 | $herecurr); | 1700 | $herecurr); |
| 1636 | } | 1701 | } |
| 1637 | } | 1702 | } |
| @@ -1692,15 +1757,24 @@ sub process { | |||
| 1692 | if ($#chunks > 0 && $level == 0) { | 1757 | if ($#chunks > 0 && $level == 0) { |
| 1693 | my $allowed = 0; | 1758 | my $allowed = 0; |
| 1694 | my $seen = 0; | 1759 | my $seen = 0; |
| 1695 | my $herectx = $here . "\n";; | 1760 | my $herectx = $here . "\n"; |
| 1696 | my $ln = $linenr - 1; | 1761 | my $ln = $linenr - 1; |
| 1697 | for my $chunk (@chunks) { | 1762 | for my $chunk (@chunks) { |
| 1698 | my ($cond, $block) = @{$chunk}; | 1763 | my ($cond, $block) = @{$chunk}; |
| 1699 | 1764 | ||
| 1700 | $herectx .= "$rawlines[$ln]\n[...]\n"; | 1765 | # If the condition carries leading newlines, then count those as offsets. |
| 1766 | my ($whitespace) = ($cond =~ /^((?:\s*\n[+-])*\s*)/s); | ||
| 1767 | my $offset = statement_rawlines($whitespace) - 1; | ||
| 1768 | |||
| 1769 | #print "COND<$cond> whitespace<$whitespace> offset<$offset>\n"; | ||
| 1770 | |||
| 1771 | # We have looked at and allowed this specific line. | ||
| 1772 | $suppress_ifbraces{$ln + $offset} = 1; | ||
| 1773 | |||
| 1774 | $herectx .= "$rawlines[$ln + $offset]\n[...]\n"; | ||
| 1701 | $ln += statement_rawlines($block) - 1; | 1775 | $ln += statement_rawlines($block) - 1; |
| 1702 | 1776 | ||
| 1703 | substr($block, 0, length($cond)) = ''; | 1777 | substr($block, 0, length($cond), ''); |
| 1704 | 1778 | ||
| 1705 | $seen++ if ($block =~ /^\s*{/); | 1779 | $seen++ if ($block =~ /^\s*{/); |
| 1706 | 1780 | ||
| @@ -1721,16 +1795,10 @@ sub process { | |||
| 1721 | if ($seen && !$allowed) { | 1795 | if ($seen && !$allowed) { |
| 1722 | WARN("braces {} are not necessary for any arm of this statement\n" . $herectx); | 1796 | WARN("braces {} are not necessary for any arm of this statement\n" . $herectx); |
| 1723 | } | 1797 | } |
| 1724 | # Either way we have looked over this whole | ||
| 1725 | # statement and said what needs to be said. | ||
| 1726 | $suppress_ifbraces = $endln; | ||
| 1727 | } | 1798 | } |
| 1728 | } | 1799 | } |
| 1729 | if ($linenr > $suppress_ifbraces && | 1800 | if (!defined $suppress_ifbraces{$linenr - 1} && |
| 1730 | $line =~ /\b(if|while|for|else)\b/) { | 1801 | $line =~ /\b(if|while|for|else)\b/) { |
| 1731 | my ($level, $endln, @chunks) = | ||
| 1732 | ctx_statement_full($linenr, $realcnt, $-[0]); | ||
| 1733 | |||
| 1734 | my $allowed = 0; | 1802 | my $allowed = 0; |
| 1735 | 1803 | ||
| 1736 | # Check the pre-context. | 1804 | # Check the pre-context. |
| @@ -1738,10 +1806,15 @@ sub process { | |||
| 1738 | #print "APW: ALLOWED: pre<$1>\n"; | 1806 | #print "APW: ALLOWED: pre<$1>\n"; |
| 1739 | $allowed = 1; | 1807 | $allowed = 1; |
| 1740 | } | 1808 | } |
| 1809 | |||
| 1810 | my ($level, $endln, @chunks) = | ||
| 1811 | ctx_statement_full($linenr, $realcnt, $-[0]); | ||
| 1812 | |||
| 1741 | # Check the condition. | 1813 | # Check the condition. |
| 1742 | my ($cond, $block) = @{$chunks[0]}; | 1814 | my ($cond, $block) = @{$chunks[0]}; |
| 1815 | #print "CHECKING<$linenr> cond<$cond> block<$block>\n"; | ||
| 1743 | if (defined $cond) { | 1816 | if (defined $cond) { |
| 1744 | substr($block, 0, length($cond)) = ''; | 1817 | substr($block, 0, length($cond), ''); |
| 1745 | } | 1818 | } |
| 1746 | if (statement_lines($cond) > 1) { | 1819 | if (statement_lines($cond) > 1) { |
| 1747 | #print "APW: ALLOWED: cond<$cond>\n"; | 1820 | #print "APW: ALLOWED: cond<$cond>\n"; |
| @@ -1759,7 +1832,7 @@ sub process { | |||
| 1759 | if (defined $chunks[1]) { | 1832 | if (defined $chunks[1]) { |
| 1760 | my ($cond, $block) = @{$chunks[1]}; | 1833 | my ($cond, $block) = @{$chunks[1]}; |
| 1761 | if (defined $cond) { | 1834 | if (defined $cond) { |
| 1762 | substr($block, 0, length($cond)) = ''; | 1835 | substr($block, 0, length($cond), ''); |
| 1763 | } | 1836 | } |
| 1764 | if ($block =~ /^\s*\{/) { | 1837 | if ($block =~ /^\s*\{/) { |
| 1765 | #print "APW: ALLOWED: chunk-1 block<$block>\n"; | 1838 | #print "APW: ALLOWED: chunk-1 block<$block>\n"; |
| @@ -1882,6 +1955,28 @@ sub process { | |||
| 1882 | if ($line =~ /__FUNCTION__/) { | 1955 | if ($line =~ /__FUNCTION__/) { |
| 1883 | WARN("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr); | 1956 | WARN("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr); |
| 1884 | } | 1957 | } |
| 1958 | |||
| 1959 | # check for semaphores used as mutexes | ||
| 1960 | if ($line =~ /\b(DECLARE_MUTEX|init_MUTEX)\s*\(/) { | ||
| 1961 | WARN("mutexes are preferred for single holder semaphores\n" . $herecurr); | ||
| 1962 | } | ||
| 1963 | # check for semaphores used as mutexes | ||
| 1964 | if ($line =~ /\binit_MUTEX_LOCKED\s*\(/) { | ||
| 1965 | WARN("consider using a completion\n" . $herecurr); | ||
| 1966 | } | ||
| 1967 | # recommend strict_strto* over simple_strto* | ||
| 1968 | if ($line =~ /\bsimple_(strto.*?)\s*\(/) { | ||
| 1969 | WARN("consider using strict_$1 in preference to simple_$1\n" . $herecurr); | ||
| 1970 | } | ||
| 1971 | |||
| 1972 | # use of NR_CPUS is usually wrong | ||
| 1973 | # ignore definitions of NR_CPUS and usage to define arrays as likely right | ||
| 1974 | if ($line =~ /\bNR_CPUS\b/ && | ||
| 1975 | $line !~ /^.#\s*define\s+NR_CPUS\s+/ && | ||
| 1976 | $line !~ /^.\s*$Declare\s.*\[[^\]]*NR_CPUS[^\]]*\]/) | ||
| 1977 | { | ||
| 1978 | WARN("usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc\n" . $herecurr); | ||
| 1979 | } | ||
| 1885 | } | 1980 | } |
| 1886 | 1981 | ||
| 1887 | # If we have no input at all, then there is nothing to report on | 1982 | # If we have no input at all, then there is nothing to report on |
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c index 87a672680761..b63839e8f9bd 100644 --- a/sound/oss/ac97_codec.c +++ b/sound/oss/ac97_codec.c | |||
| @@ -1202,3 +1202,5 @@ static int pt101_init(struct ac97_codec * codec) | |||
| 1202 | 1202 | ||
| 1203 | EXPORT_SYMBOL(ac97_probe_codec); | 1203 | EXPORT_SYMBOL(ac97_probe_codec); |
| 1204 | 1204 | ||
| 1205 | MODULE_LICENSE("GPL"); | ||
| 1206 | |||