Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5921
b: refs/heads/master
c: 14869c3
h: refs/heads/master
i:
  5919: 77d656f
v: v3
  • Loading branch information
Dmitry Yusupov authored and David S. Miller committed Aug 23, 2005
1 parent e2fce79 commit d637627
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a4cce10492358b33d33bb43f98284c80482037e8
refs/heads/master: 14869c388673e8db3348ab3706fa6485d0f0cf95
2 changes: 1 addition & 1 deletion trunk/arch/ia64/hp/sim/boot/boot_head.S
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ GLOBAL_ENTRY(_start)
.save rp, r0
.body
movl gp = __gp
movl sp = stack_mem+16384-16
movl sp = stack_mem
bsw.1
br.call.sptk.many rp=start_bootloader
END(_start)
Expand Down
18 changes: 8 additions & 10 deletions trunk/arch/ia64/sn/kernel/io_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
struct pci_controller *controller;
struct pcibus_bussoft *prom_bussoft_ptr;
struct hubdev_info *hubdev_info;
void *provider_soft = NULL;
void *provider_soft;
struct sn_pcibus_provider *provider;

status = sal_get_pcibus_info((u64) segment, (u64) busnum,
Expand All @@ -339,7 +339,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
if (bus == NULL) {
bus = pci_scan_bus(busnum, &pci_root_ops, controller);
if (bus == NULL)
goto error_return; /* error, or bus already scanned */
return; /* error, or bus already scanned */
bus->sysdata = NULL;
}

Expand All @@ -352,30 +352,28 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
*/

if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES)
goto error_return; /* unsupported asic type */
return; /* unsupported asic type */

if (prom_bussoft_ptr->bs_asic_type == PCIIO_ASIC_TYPE_PPB)
goto error_return; /* no further fixup necessary */

provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
if (provider == NULL)
goto error_return; /* no provider registerd for this asic */
return; /* no provider registerd for this asic */

bus->sysdata = controller;
provider_soft = NULL;
if (provider->bus_fixup)
provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr, controller);

if (provider_soft == NULL) {
/* fixup failed or not applicable */
bus->sysdata = NULL;
goto error_return;
}
if (provider_soft == NULL)
return; /* fixup failed or not applicable */

/*
* Generic bus fixup goes here. Don't reference prom_bussoft_ptr
* after this point.
*/

bus->sysdata = controller;
PCI_CONTROLLER(bus)->platform_data = provider_soft;
nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base);
cnode = nasid_to_cnodeid(nasid);
Expand Down
8 changes: 8 additions & 0 deletions trunk/include/asm-ia64/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ static inline void ___ia64_mmiowb(void)
ia64_mfa();
}

static inline const unsigned long
__ia64_get_io_port_base (void)
{
extern unsigned long ia64_iobase;

return ia64_iobase;
}

static inline void*
__ia64_mk_io_addr (unsigned long port)
{
Expand Down
4 changes: 0 additions & 4 deletions trunk/net/ipv4/tcp_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -925,10 +925,6 @@ static int tcp_tso_should_defer(struct sock *sk, struct tcp_sock *tp, struct sk_

limit = min(send_win, cong_win);

/* If sk_send_head can be sent fully now, just do it. */
if (skb->len <= limit)
return 0;

if (sysctl_tcp_tso_win_divisor) {
u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache);

Expand Down

0 comments on commit d637627

Please sign in to comment.