diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2016-08-01 12:34:01 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-08-01 12:34:01 -0500 |
| commit | 9454c23852ca6d7aec89fd6fd46a046c323caac3 (patch) | |
| tree | 794be65345027b5adea3720a43124fee338333a5 /arch/tile/include/asm | |
| parent | Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-dra7xx', 'pci/host-hv', 'pci/host-vmd' and 'pci/host-xilinx' into next (diff) | |
| parent | PCI: Spread interrupt vectors in pci_alloc_irq_vectors() (diff) | |
| download | linux-dev-9454c23852ca6d7aec89fd6fd46a046c323caac3.tar.xz linux-dev-9454c23852ca6d7aec89fd6fd46a046c323caac3.zip | |
Merge branch 'pci/msi-affinity' into next
Conflicts:
drivers/nvme/host/pci.c
Diffstat (limited to 'arch/tile/include/asm')
| -rw-r--r-- | arch/tile/include/asm/thread_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h index 4b7cef9e94e0..c1467ac59ce6 100644 --- a/arch/tile/include/asm/thread_info.h +++ b/arch/tile/include/asm/thread_info.h @@ -78,7 +78,7 @@ struct thread_info { #ifndef __ASSEMBLY__ -void arch_release_thread_info(struct thread_info *info); +void arch_release_thread_stack(unsigned long *stack); /* How to get the thread information struct from C. */ register unsigned long stack_pointer __asm__("sp"); |